Move DisplaySettings to Options

Debugger/ILSpy.Debugger/Services/Debugger/WindowsDebugger.cs

@@ -282,6 +282,9 @@ namespace ICSharpCode.ILSpy.Debugger.Services
 			int key = frame.MethodInfo.MetadataToken;
 			
 			// get the mapped instruction from the current line marker or the next one
+			if (!DebugData.CodeMappings.ContainsKey(key))
+				return null;
+			
 			return DebugData.CodeMappings[key].GetInstructionByTokenAndOffset(key, frame.IP, out isMatch);
 		}
 		

ILSpy/DecompilationOptions.cs

@@ -19,6 +19,7 @@
 using System;
 using System.Threading;
 using ICSharpCode.Decompiler;
+using ICSharpCode.ILSpy.Options;
 
 namespace ICSharpCode.ILSpy
 {

ILSpy/ILSpy.csproj

@@ -102,7 +102,6 @@
     <Compile Include="ConnectMethodDecompiler.cs" />
     <Compile Include="Controls\DockedPane.cs" />
     <Compile Include="Commands\DecompileAllCommand.cs" />
-    <Compile Include="DisplaySettings.cs" />
     <Compile Include="Commands\ExportCommandAttribute.cs" />
     <Compile Include="Commands\DebuggerCommands.cs" />
     <Compile Include="Controls\SearchBox.cs" />
@@ -144,6 +143,11 @@
       <DependentUpon>DecompilerSettingsPanel.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Options\DisplaySettings.cs" />
+    <Compile Include="Options\DisplaySettingsPanel.xaml.cs">
+      <DependentUpon>DisplaySettingsPanel.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Options\OptionsDialog.xaml.cs">
       <DependentUpon>OptionsDialog.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -154,10 +158,6 @@
     <Compile Include="SearchPane.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="DisplaySettingsPanel.xaml.cs">
-      <DependentUpon>DisplaySettingsPanel.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Commands\SimpleCommand.cs" />
     <Compile Include="Commands\ShowAnalyzerCommand.cs" />
     <Compile Include="TreeNodes\Analyzer\AnalyzeContextMenuEntry.cs" />
@@ -260,11 +260,11 @@
     <Page Include="OpenFromGacDialog.xaml" />
     <Page Include="Options\DebuggerSettingsPanel.xaml" />
     <Page Include="Options\DecompilerSettingsPanel.xaml" />
+    <Page Include="Options\DisplaySettingsPanel.xaml" />
     <Page Include="Options\OptionsDialog.xaml" />
     <Page Include="SearchPane.xaml">
       <DependentUpon>SearchPane.cs</DependentUpon>
     </Page>
-    <Page Include="DisplaySettingsPanel.xaml" />
     <Page Include="TextView\DecompilerTextView.xaml">
       <DependentUpon>DecompilerTextView.cs</DependentUpon>
     </Page>

ILSpy/Languages/CSharpLanguage.cs

@@ -32,6 +32,7 @@ using ICSharpCode.Decompiler;
 using ICSharpCode.Decompiler.Ast;
 using ICSharpCode.Decompiler.Ast.Transforms;
 using ICSharpCode.ILSpy.Baml;
+using ICSharpCode.ILSpy.Options;
 using ICSharpCode.ILSpy.XmlDoc;
 using ICSharpCode.NRefactory.CSharp;
 using Mono.Cecil;

ILSpy/LoadedAssembly.cs

@@ -22,6 +22,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Threading;
 
+using ICSharpCode.ILSpy.Options;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy

ILSpy/Options/DecompilerSettingsPanel.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="ICSharpCode.ILSpy.DecompilerSettingsPanel"
+<UserControl x:Class="ICSharpCode.ILSpy.Options.DecompilerSettingsPanel"
              x:ClassModifier="internal"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">

ILSpy/Options/DecompilerSettingsPanel.xaml.cs

@@ -28,7 +28,7 @@ using System.Windows.Media;
 using System.Xml.Linq;
 using ICSharpCode.Decompiler;
 
-namespace ICSharpCode.ILSpy
+namespace ICSharpCode.ILSpy.Options
 {
 	/// <summary>
 	/// Interaction logic for DecompilerSettingsPanel.xaml

ILSpy/Options/DisplaySettings.cs

@@ -20,7 +20,7 @@ using System;
 using System.ComponentModel;
 using System.Windows.Media;
 
-namespace ICSharpCode.ILSpy
+namespace ICSharpCode.ILSpy.Options
 {
 	/// <summary>
 	/// Description of DisplaySettings.

ILSpy/Options/DisplaySettingsPanel.xaml

@@ -1,7 +1,7 @@
-<UserControl x:Class="ICSharpCode.ILSpy.DisplaySettingsPanel"
+<UserControl x:Class="ICSharpCode.ILSpy.Options.DisplaySettingsPanel"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:ICSharpCode.ILSpy">
+             xmlns:local="clr-namespace:ICSharpCode.ILSpy.Options">
 	<UserControl.Resources>
 		<local:FontSizeConverter x:Key="fontSizeConv" />
 	</UserControl.Resources>

ILSpy/Options/DisplaySettingsPanel.xaml.cs

@@ -31,7 +31,7 @@ using System.Windows.Threading;
 using System.Xml.Linq;
 using ICSharpCode.Decompiler;
 
-namespace ICSharpCode.ILSpy
+namespace ICSharpCode.ILSpy.Options
 {
 	/// <summary>
 	/// Interaction logic for DisplaySettingsPanel.xaml

ILSpy/Options/OptionsDialog.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="ICSharpCode.ILSpy.OptionsDialog"
+<Window x:Class="ICSharpCode.ILSpy.Options.OptionsDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Style="{DynamicResource DialogWindow}"

ILSpy/Options/OptionsDialog.xaml.cs

@@ -29,7 +29,7 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Xml.Linq;
 
-namespace ICSharpCode.ILSpy
+namespace ICSharpCode.ILSpy.Options
 {
 	/// <summary>
 	/// Interaction logic for OptionsDialog.xaml

ILSpy/TextView/DecompilerTextView.cs

@@ -44,6 +44,7 @@ using ICSharpCode.ILSpy.Debugger.AvalonEdit;
 using ICSharpCode.ILSpy.Debugger.Bookmarks;
 using ICSharpCode.ILSpy.Debugger.Services;
 using ICSharpCode.ILSpy.Debugger.Tooltips;
+using ICSharpCode.ILSpy.Options;
 using ICSharpCode.ILSpy.TreeNodes;
 using ICSharpCode.ILSpy.XmlDoc;
 using ICSharpCode.NRefactory.Documentation;

TestPlugin/CustomOptionPage.xaml.cs

@@ -13,6 +13,7 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Xml.Linq;
 using ICSharpCode.ILSpy;
+using ICSharpCode.ILSpy.Options;
 
 namespace TestPlugin
 {