DebuggerInterop.Symbols.il replaced by ISymWrapper.dll

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@60 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj

@@ -29,6 +29,7 @@
       <HintPath>..\RequiredLibraries\Debugger.Interop.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="ISymWrapper" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Windows.Forms" />

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NDebugger.cs

@@ -9,7 +9,6 @@ using System.Runtime.InteropServices;
 using System.Text;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 using DebuggerInterop.MetaData;
 
 namespace DebuggerLibrary
@@ -482,14 +481,14 @@ namespace DebuggerLibrary
 			// Check if there is breakpoint on that line
 			foreach (Breakpoint breakpoint in Breakpoints) {
 				// TODO check filename too
-				if (breakpoint.SourcecodeSegment.StartLine == (uint)line) {
+				if (breakpoint.SourcecodeSegment.StartLine == line) {
 					Breakpoints.Remove(breakpoint);
 					return;
 				}
 			}
 
 			// Add the breakpoint 
-			int index = Breakpoints.Add(fileName, (uint)line, (uint)column);
+			int index = Breakpoints.Add(fileName, line, column);
 			Breakpoint addedBreakpoint = breakpoints[index];
 
             // Check if it wasn't forced to move to different line with breakpoint

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NativeMethods.cs

@@ -5,7 +5,6 @@ using System.Runtime.InteropServices;
 using System.Text;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 using DebuggerInterop.MetaData;
 
 namespace DebuggerLibrary

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Private Classes/Eval.cs

@@ -8,7 +8,6 @@ using System.Collections;
 using System.Runtime.InteropServices;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 using DebuggerInterop.MetaData;
 
 namespace DebuggerLibrary

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Private Classes/EvalQueue.cs

@@ -8,7 +8,6 @@ using System.Collections;
 using System.Runtime.InteropServices;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 using DebuggerInterop.MetaData;
 
 namespace DebuggerLibrary

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Private Classes/MTA2STA.cs

@@ -9,7 +9,6 @@ using System.Threading;
 using System.Windows.Forms;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 
 namespace DebuggerInterop.Core
 {

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Private Classes/ManagedCallback.cs

@@ -6,7 +6,6 @@ using System;
 using System.Runtime.InteropServices;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 
 namespace DebuggerLibrary
 {

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Private Classes/ManagedCallbackProxy.cs

@@ -9,7 +9,6 @@ using System.Threading;
 using System.Windows.Forms;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 
 // Function finding regular expresion:
 //    ^{\t*}{(:Ll| )*{:i} *\(((.# {:i}, |\))|())^6\)*}\n\t*\{(.|\n)@\}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Public Classes/Breakpoint.cs

@@ -3,11 +3,11 @@
 // </file>
 
 using System;
+using System.Diagnostics.SymbolStore;
 using System.Collections;
 using System.Runtime.InteropServices;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 
 namespace DebuggerLibrary
 {
@@ -73,20 +73,20 @@ namespace DebuggerLibrary
 			sourcecodeSegment = segment;
 		}
 
-		public Breakpoint(uint line)
+		public Breakpoint(int line)
 		{
 			sourcecodeSegment = new SourcecodeSegment();
 			sourcecodeSegment.StartLine = line;
 		}
 
-		public Breakpoint(string sourceFilename, uint line)
+		public Breakpoint(string sourceFilename, int line)
 		{
 			sourcecodeSegment = new SourcecodeSegment();
 			sourcecodeSegment.SourceFilename = sourceFilename;
 			sourcecodeSegment.StartLine = line;
 		}
 
-		public Breakpoint(string sourceFilename, uint line, uint column)
+		public Breakpoint(string sourceFilename, int line, int column)
 		{
 			sourcecodeSegment = new SourcecodeSegment();
 			sourcecodeSegment.SourceFilename = sourceFilename;
@@ -129,9 +129,9 @@ namespace DebuggerLibrary
 
 			SourcecodeSegment seg = sourcecodeSegment;
 
-			Module                 module  = null;
-			ISymUnmanagedReader    symReader  = null;
-			ISymUnmanagedDocument  symDoc     = null;
+			Module           module     = null;
+			ISymbolReader    symReader  = null;
+			ISymbolDocument  symDoc     = null;
 
 			// Try to get doc from seg.moduleFilename
 			if (seg.ModuleFilename != null)
@@ -167,7 +167,7 @@ namespace DebuggerLibrary
 				return;
 			}
 
-			uint validStartLine;
+			int validStartLine;
 			validStartLine = symDoc.FindClosestLine(seg.StartLine);
 			if (validStartLine != seg.StartLine) {
 				seg.StartLine = validStartLine;
@@ -176,18 +176,18 @@ namespace DebuggerLibrary
 				seg.EndColumn = 0;
 			}
 
-			ISymUnmanagedMethod symMethod;
+			ISymbolMethod symMethod;
 			symMethod = symReader.GetMethodFromDocumentPosition(symDoc, seg.StartLine, seg.StartColumn);
 			
-			uint corInstructionPtr = symMethod.GetOffset(symDoc, seg.StartLine, seg.StartColumn);
+			int corInstructionPtr = symMethod.GetOffset(symDoc, seg.StartLine, seg.StartColumn);
 
 			ICorDebugFunction corFunction;
-			module.CorModule.GetFunctionFromToken(symMethod.GetToken(), out corFunction);
+			module.CorModule.GetFunctionFromToken((uint)symMethod.Token.GetToken(), out corFunction);
 
 			ICorDebugCode code;
 			corFunction.GetILCode(out code);
 
-			code.CreateBreakpoint(corInstructionPtr, out corBreakpoint);
+			code.CreateBreakpoint((uint)corInstructionPtr, out corBreakpoint);
 			
 			hadBeenSet = true;
 			corBreakpoint.Activate(enabled?1:0);

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Public Classes/BreakpointCollection.cs

@@ -7,7 +7,6 @@ using System.Runtime.InteropServices;
 using System.Collections;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 using DebuggerInterop.MetaData;
 
 namespace DebuggerLibrary
@@ -105,17 +104,17 @@ namespace DebuggerLibrary
 			return Add(new Breakpoint(segment));
 		}
 
-		public int Add(uint line)
+		public int Add(int line)
 		{
 			return Add(new Breakpoint(line));
 		}
 
-		public int Add(string sourceFilename, uint line)
+		public int Add(string sourceFilename, int line)
 		{
 			return Add(new Breakpoint(sourceFilename, line));
 		}
 
-		public int Add(string sourceFilename, uint line, uint column)
+		public int Add(string sourceFilename, int line, int column)
 		{
 			return Add(new Breakpoint(sourceFilename, line, column));
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Public Classes/Exception.cs

@@ -7,7 +7,6 @@ using System.Runtime.InteropServices;
 using System.Threading;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 using DebuggerInterop.MetaData;
 
 namespace DebuggerLibrary

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Public Classes/Function.cs

@@ -3,11 +3,11 @@
 // </file>
 
 using System;
+using System.Diagnostics.SymbolStore;
 using System.Runtime.InteropServices;
 using System.Threading;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 using DebuggerInterop.MetaData;
 
 
@@ -17,7 +17,7 @@ namespace DebuggerLibrary
 	{	
 		string name;
 		Module module;
-		uint token;
+		SymbolToken token;
 		uint parentClassToken = 0;
 		uint attributes;
 		ICorDebugFrame    corFrame;
@@ -39,7 +39,9 @@ namespace DebuggerLibrary
 		{
 			this.corFrame = corFrame;
 			corFrame.GetFunction(out corFunction);
-			corFunction.GetToken(out token);
+            uint functionToken;
+			corFunction.GetToken(out functionToken);
+            this.token = new SymbolToken((int)functionToken);
 			ICorDebugModule corModule;
 			corFunction.GetModule(out corModule);
 			module = NDebugger.Modules[corModule];
@@ -54,7 +56,7 @@ namespace DebuggerLibrary
 			IntPtr pSigBlob;
 			uint sigBlobSize;
 			module.MetaDataInterface.GetMethodProps(
-			                              token,
+			                              (uint)token.GetToken(),
                                           out parentClassToken,
                                           NDebugger.pString,
                                           NDebugger.pStringLen,
@@ -91,7 +93,7 @@ namespace DebuggerLibrary
 		
 		// Helpping properties for symbols
 
-		internal ISymUnmanagedReader symReader {
+		internal ISymbolReader symReader {
 			get	{
 				if (module.SymbolsLoaded == false) throw new SymbolsNotAviableException();
 				if (module.SymReader == null) throw new SymbolsNotAviableException();
@@ -99,7 +101,7 @@ namespace DebuggerLibrary
 			}
 		}
 
-		internal ISymUnmanagedMethod symMethod {
+		internal ISymbolMethod symMethod {
 			get	{
 				return symReader.GetMethod(token);
 			}
@@ -140,13 +142,22 @@ namespace DebuggerLibrary
 			ICorDebugStepper stepper;
 			corFrame.CreateStepper(out stepper);
 
-			uint rangeCount;
-			symMethod.GetRanges(nextSt.SymUnmanagedDocument, nextSt.StartLine, 0, 0, out rangeCount, IntPtr.Zero);
-			IntPtr pRanges = Marshal.AllocHGlobal(4*(int)rangeCount);
-			symMethod.GetRanges(nextSt.SymUnmanagedDocument, nextSt.StartLine, 0, rangeCount, out rangeCount, pRanges);
-			stepper.StepRange(stepIn?1:0, pRanges, rangeCount);
+			//uint rangeCount;
+			//symMethod.GetRanges(nextSt.SymbolDocument, nextSt.StartLine, 0, 0, out rangeCount, IntPtr.Zero);
+			//IntPtr pRanges = Marshal.AllocHGlobal(4*(int)rangeCount);
+			//symMethod.GetRanges(nextSt.SymbolDocument, nextSt.StartLine, 0, rangeCount, out rangeCount, pRanges);
+
+            int[] ranges = symMethod.GetRanges(nextSt.SymbolDocument, nextSt.StartLine, 0);
+            IntPtr pRanges = Marshal.AllocHGlobal(4*ranges.Length);
+            for (int i = 0; i < ranges.Length; i++) {
+                ((int*)pRanges.ToPointer())[i] = ranges[i];
+            }
+
+			stepper.StepRange(stepIn?1:0, pRanges, (uint)ranges.Length);
 			Marshal.FreeHGlobal(pRanges);
 
+            
+
 			NDebugger.Continue();
 		}
 		
@@ -155,7 +166,7 @@ namespace DebuggerLibrary
 			get {
 				SourcecodeSegment retVal = new SourcecodeSegment();
 
-				ISymUnmanagedMethod symMethod;
+				ISymbolMethod symMethod;
 				try {
 					symMethod = this.symMethod; 
 				}
@@ -166,19 +177,17 @@ namespace DebuggerLibrary
 					throw new NextStatementNotAviableException();
 				}
 
-				uint     sequencePointCount = symMethod.GetSequencePointCount();
+                int sequencePointCount = symMethod.SequencePointCount;
 				
-				uint[]   offsets            = new uint[sequencePointCount];
-				uint[]   startLine          = new uint[sequencePointCount];
-				uint[]   startColumn        = new uint[sequencePointCount];
-				uint[]   endLine            = new uint[sequencePointCount];
-				uint[]   endColumn          = new uint[sequencePointCount];
+				int[] offsets     = new int[sequencePointCount];
+				int[] startLine   = new int[sequencePointCount];
+				int[] startColumn = new int[sequencePointCount];
+				int[] endLine     = new int[sequencePointCount];
+				int[] endColumn   = new int[sequencePointCount];
 				
-				ISymUnmanagedDocument[] Doc = new ISymUnmanagedDocument[sequencePointCount];
+				ISymbolDocument[] Doc = new ISymbolDocument[sequencePointCount];
 				
 				symMethod.GetSequencePoints(
-					sequencePointCount,
-					out sequencePointCount,
 					offsets,
 					Doc,
 					startLine,
@@ -189,18 +198,15 @@ namespace DebuggerLibrary
 
 				uint corInstructionPtr = this.corInstructionPtr; // cache
 
-				for (uint i = sequencePointCount-1 ; i >= 0; i--) // backwards
+				for (int i = sequencePointCount - 1; i >= 0; i--) // backwards
 					if (offsets[i] <= corInstructionPtr)
 					{
 						// 0xFeeFee means "code generated by compiler"
 						if (startLine[i] == 0xFeeFee) throw new NextStatementNotAviableException();
 
-						retVal.SymUnmanagedDocument = Doc[i];
+						retVal.SymbolDocument = Doc[i];
 
-						retVal.SymUnmanagedDocument.GetURL(NDebugger.pStringLen,
-						                       out NDebugger.unused, // real string lenght
-						                       NDebugger.pString);
-						retVal.SourceFilename = NDebugger.pStringAsUnicode;
+						retVal.SourceFilename = retVal.SymbolDocument.URL;
 						
 						retVal.ModuleFilename = module.FullPath;
 
@@ -244,7 +250,7 @@ namespace DebuggerLibrary
 				uint paramsFetched;
 				for (uint i = (uint)(isStatic?0:1); i < argCount; i++) {
 					uint paramToken;
-					Module.MetaDataInterface.EnumParams(ref paramEnumPtr , token, out paramToken, 1, out paramsFetched);
+					Module.MetaDataInterface.EnumParams(ref paramEnumPtr , (uint)token.GetToken(), out paramToken, 1, out paramsFetched);
 					if (paramsFetched == 0) break;
 					
 					ICorDebugValue arg;
@@ -268,8 +274,8 @@ namespace DebuggerLibrary
 				}
 				
 			// local variables
-				ISymUnmanagedScope symRootScope;
-				symRootScope = symMethod.GetRootScope();
+				ISymbolScope symRootScope;
+				symRootScope = symMethod.RootScope;
 				AddScopeToVariableCollection(symRootScope, ref collection);
 				
 			// Properties		
@@ -315,52 +321,26 @@ namespace DebuggerLibrary
 			return collection;
 		}
 
-		private unsafe void AddScopeToVariableCollection(ISymUnmanagedScope symScope, ref VariableCollection collection)
+		private unsafe void AddScopeToVariableCollection(ISymbolScope symScope, ref VariableCollection collection)
 		{
-			uint childScopesCount;
-			symScope.GetChildren(0, out childScopesCount, null);
-			
-			if (childScopesCount > 0) {
-				ISymUnmanagedScope[] childScopes = new ISymUnmanagedScope[childScopesCount];
-				
-				symScope.GetChildren(childScopesCount, out childScopesCount, childScopes);
-				
-				foreach(ISymUnmanagedScope childScope in childScopes) {
-					AddScopeToVariableCollection(childScope, ref collection);
-				}
+			foreach(ISymbolScope childScope in symScope.GetChildren()) {
+				AddScopeToVariableCollection(childScope, ref collection);
 			}
-
 			AddVariablesToVariableCollection(symScope, ref collection);
 		}
 
-		private unsafe void AddVariablesToVariableCollection(ISymUnmanagedScope symScope, ref VariableCollection collection)
+		private unsafe void AddVariablesToVariableCollection(ISymbolScope symScope, ref VariableCollection collection)
 		{
-			uint varCount;
-			varCount = symScope.GetLocalCount();
-
-			if (varCount > 0) {
-				ISymUnmanagedVariable[] symVars = new ISymUnmanagedVariable[varCount];
-			
-				symScope.GetLocals(varCount, out varCount, symVars);
-
-				foreach (ISymUnmanagedVariable symVar in symVars) {
-					AddVariableToVariableCollection(symVar , ref collection);
-				}
+			foreach (ISymbolVariable symVar in symScope.GetLocals()) {
+				AddVariableToVariableCollection(symVar , ref collection);
 			}
 		}
 
-		private unsafe void AddVariableToVariableCollection(ISymUnmanagedVariable symVar, ref VariableCollection collection)
+		private unsafe void AddVariableToVariableCollection(ISymbolVariable symVar, ref VariableCollection collection)
 		{
 			ICorDebugValue runtimeVar;
-			uint address;
-			address = symVar.GetAddressField1();
-			corILFrame.GetLocalVariable(address, out runtimeVar);
-			
-			symVar.GetName(NDebugger.pStringLen, 
-			               out NDebugger.unused, // real string name
-			               NDebugger.pString);			
-
-			collection.Add(VariableFactory.CreateVariable(runtimeVar, NDebugger.pStringAsUnicode));
+			corILFrame.GetLocalVariable((uint)symVar.AddressField1, out runtimeVar);
+			collection.Add(VariableFactory.CreateVariable(runtimeVar, symVar.Name));
 		}
 	}
 }

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Public Classes/Module.cs

@@ -3,10 +3,10 @@
 // </file>
 
 using System;
+using System.Diagnostics.SymbolStore;
 using System.Runtime.InteropServices;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 using DebuggerInterop.MetaData;
 
 namespace DebuggerLibrary
@@ -20,7 +20,7 @@ namespace DebuggerLibrary
 		
 		int orderOfLoading = 0;
 		readonly ICorDebugModule corModule;
-		ISymUnmanagedReader symReader;
+		ISymbolReader symReader;
 		object pMetaDataInterface;
 		IMetaDataImport metaDataInterface;
 		
@@ -29,7 +29,7 @@ namespace DebuggerLibrary
 				return metaDataInterface;
 			}
 		}
-		public ISymUnmanagedReader SymReader {
+		public ISymbolReader SymReader {
 			get {
 				return symReader;
 			}
@@ -112,13 +112,16 @@ namespace DebuggerLibrary
 			pModule.GetName(NDebugger.pStringLen,
 			                out NDebugger.unused, // real string lenght
 			                NDebugger.pString);
-			fullPath = NDebugger.pStringAsUnicode;		
+			fullPath = NDebugger.pStringAsUnicode;	
+	
+            
 			
-			ISymUnmanagedBinder symBinder = new CorSymBinder_SxSClass();
-			int hr = symBinder.GetReaderForFile (pMetaDataInterface, NDebugger.pString, IntPtr.Zero, out symReader);
-			if (hr != 0) {
-				symReader = null;
-			}
+			SymBinder symBinder = new SymBinder();
+            try {
+			    symReader = symBinder.GetReader(Marshal.GetIUnknownForObject(metaDataInterface), fullPath, string.Empty);
+            } catch (System.Exception e) {
+                symReader = null;
+            }
 		}
 	}
 }

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Public Classes/SourcecodeSegment.cs

@@ -3,8 +3,7 @@
 // </file>
 
 using System;
-
-using DebuggerInterop.Symbols;
+using System.Diagnostics.SymbolStore;
 
 namespace DebuggerLibrary
 {
@@ -12,11 +11,11 @@ namespace DebuggerLibrary
 	{
 		string moduleFilename;
 		string sourceFilename;
-		uint startLine;
-		uint startColumn;
-		uint endLine;
-		uint endColumn;
-		ISymUnmanagedDocument symUnmanagedDocument;
+		int startLine;
+		int startColumn;
+		int endLine;
+		int endColumn;
+		ISymbolDocument symUnmanagedDocument;
 		
 		public string ModuleFilename {
 			get {
@@ -36,7 +35,7 @@ namespace DebuggerLibrary
 			}
 		}
 		
-		public uint StartLine {
+		public int StartLine {
 			get {
 				return startLine;
 			}
@@ -45,7 +44,7 @@ namespace DebuggerLibrary
 			}
 		}
 		
-		public uint StartColumn {
+		public int StartColumn {
 			get {
 				return startColumn;
 			}
@@ -54,7 +53,7 @@ namespace DebuggerLibrary
 			}
 		}
 		
-		public uint EndLine {
+		public int EndLine {
 			get {
 				return endLine;
 			}
@@ -63,7 +62,7 @@ namespace DebuggerLibrary
 			}
 		}
 		
-		public uint EndColumn {
+		public int EndColumn {
 			get {
 				return endColumn;
 			}
@@ -72,7 +71,7 @@ namespace DebuggerLibrary
 			}
 		}
 		
-		public ISymUnmanagedDocument SymUnmanagedDocument {
+		public ISymbolDocument SymbolDocument {
 			get {
 				return symUnmanagedDocument;
 			}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Public Classes/Thread.cs

@@ -7,7 +7,6 @@ using System.Runtime.InteropServices;
 using System.Threading;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 using DebuggerInterop.MetaData;
 
 namespace DebuggerLibrary

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/ArrayVariable.cs

@@ -7,7 +7,6 @@ using System.Collections.Specialized;
 using System.Runtime.InteropServices;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 
 //TODO: Support for lower bound
 

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/BuiltInVariable.cs

@@ -6,7 +6,6 @@ using System;
 using System.Runtime.InteropServices;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 
 namespace DebuggerLibrary
 {

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/NullRefVariable.cs

@@ -6,7 +6,6 @@ using System;
 using System.Runtime.InteropServices;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 
 namespace DebuggerLibrary
 {

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/ObjectVariable.cs

@@ -9,7 +9,6 @@ using System.Collections.Specialized;
 using System.Runtime.InteropServices;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 using DebuggerInterop.MetaData;
 
 namespace DebuggerLibrary

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/PropertyVariable.cs

@@ -5,7 +5,6 @@
 using System;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 	
 namespace DebuggerLibrary 
 {

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/UnknownVariable.cs

@@ -6,7 +6,6 @@ using System;
 using System.Runtime.InteropServices;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 
 namespace DebuggerLibrary
 {

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variable.cs

@@ -7,7 +7,6 @@ using System.Diagnostics;
 using System.Runtime.InteropServices;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 
 namespace DebuggerLibrary
 {

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/VariableFactory.cs

@@ -5,7 +5,6 @@
 using System;
 
 using DebuggerInterop.Core;
-using DebuggerInterop.Symbols;
 
 namespace DebuggerLibrary 
 {