initial support for finding references

rainers · rainers · commit 972a02f93f45 · 2015-03-16T23:21:31.000+01:00
diff --git a/TODO b/TODO
@@ -127,8 +127,9 @@ Any/dmd:
 - arguments to local functions treated as locals
 - local functions/delegates should have debug info for closure vars ("this" exists)
 - extern(D) function arguments shown in the wrong order
-- x64: no type information for dAssocArray
 - support GDC+mago
+- bugzilla 14286: x64: no type information for dAssocArray
+- bugzilla 4014: no debug info from libraries
 
 Mago:
 - show derived class
@@ -144,7 +145,7 @@ Mago:
   - allow symbolic address input
 + no symbols for publics without debug info
 - improve stepping through C
-- load symbols from Microsoft Symbol Server, respect symbol settings
++ load symbols from Microsoft Symbol Server, respect symbol settings
 + stack: arguments show locals aswell
 - identically named locals show the same value
 + dstring shows as uint[] without string representation
diff --git a/stdext/com.d b/stdext/com.d
@@ -11,6 +11,7 @@ module stdext.com;
 //version(none):
 import std.utf;
 import std.string;
+import std.exception;
 import core.stdc.string;
 import core.stdc.wchar_ : wcslen;
 
@@ -363,6 +364,14 @@ wstring to_wstring(in char* pText)
 	return toUTF16(pText[0 .. len]);
 }
 
+wstring to_tmpwstring(in wchar* pText)
+{
+	if(!pText)
+		return ""w;
+	size_t len = wcslen(pText);
+	return assumeUnique(pText[0 .. len]);
+}
+
 ///////////////////////////////////////////////////////////////////////
 struct ScopedBSTR
 {
diff --git a/vdc/abothe/comserver/VDServer.cs b/vdc/abothe/comserver/VDServer.cs
@@ -20,7 +20,8 @@
 using D_Parser.Completion;
 using D_Parser.Resolver;
 using D_Parser.Resolver.TypeResolution;
-using D_Parser.Completion.ToolTips;
+using D_Parser.Completion.ToolTips;
+using D_Parser.Refactoring;
 
 namespace DParserCOMServer
 {
@@ -46,7 +47,9 @@ public interface IVDServer
 		void GetBinaryIsInLocations(string filename, out uint[] locs); // array of pairs of DWORD
 		void GetLastMessage(out string message);
 		void GetDefinition(string filename, int startLine, int startIndex, int endLine, int endIndex);
-		void GetDefinitionResult(out int startLine, out int startIndex, out int endLine, out int endIndex, out string filename);
+		void GetDefinitionResult(out int startLine, out int startIndex, out int endLine, out int endIndex, out string filename);
+		void GetReferences(string filename, string tok, uint line, uint idx, string expr);
+        void GetReferencesResult(out string stringList);
 	}
 
 	class NodeToolTipContentGen : NodeTooltipRepresentationGen
@@ -71,22 +74,26 @@ protected override void AppendFormat (string content, StringBuilder sb, FormatFl
 	public class VDServer : IVDServer
 	{
 		private CodeLocation   _tipStart, _tipEnd;
-		private readonly StringBuilder _tipText = new StringBuilder();
-		private StringBuilder _expansions;
+		private readonly StringBuilder _tipText = new StringBuilder();
+        private StringBuilder _expansions;
+        private StringBuilder _references;
 		private string _imports;
 		private string _stringImports;
 		private string _versionIds;
 		private string _debugIds;
 		private uint   _flags;
 		EditorData _editorData = new EditorData();
 
+        // remember modules, the global cache might not yet be ready or might have forgotten a module
 		public Dictionary<string, DModule> _modules = new Dictionary<string, DModule>();
+
 		public DModule GetModule(string fileName)
 		{
 			DModule mod;
-			if (!_modules.TryGetValue (fileName, out mod))
-				GlobalParseCache.GetModule (fileName);
-			return mod;
+			mod = GlobalParseCache.GetModule (fileName);
+            if (mod == null)
+                _modules.TryGetValue(fileName, out mod);
+            return mod;
 		}
 		public Dictionary<string, string> _sources = new Dictionary<string, string>();
 
@@ -211,7 +218,8 @@ public void GetTipResult(out int startLine, out int startIndex, out int endLine,
 			//MessageBox.Show("GetTipResult()");
 			//throw new NotImplementedException();
 		}
-		public void GetSemanticExpansions(string filename, string tok, uint line, uint idx, string expr)
+		
+        public void GetSemanticExpansions(string filename, string tok, uint line, uint idx, string expr)
 		{
 			var ast = GetModule(filename);
 
@@ -244,17 +252,8 @@ public void GetSemanticExpansionsResult(out string stringList)
 			//MessageBox.Show("GetSemanticExpansionsResult()");
 			//throw new NotImplementedException();
 		}
-		public void IsBinaryOperator(string filename, uint startLine, uint startIndex, uint endLine, uint endIndex, out bool pIsOp)
-		{
-			var ast = GetModule(filename);
 
-			if (ast == null)
-				throw new COMException("module not found", 1);
-
-			//MessageBox.Show("IsBinaryOperator()");
-			throw new NotImplementedException();
-		}
-		public void GetParseErrors(string filename, out string errors)
+        public void GetParseErrors(string filename, out string errors)
 		{
 			var ast = GetModule(filename);
 
@@ -273,19 +272,32 @@ public void GetParseErrors(string filename, out string errors)
 			errors = errs;
 			//MessageBox.Show("GetParseErrors()");
 			//throw new COMException("No Message", 1);
-		}
-		public void GetBinaryIsInLocations(string filename, out uint[] locs) // array of pairs of DWORD
+		}
+
+        public void IsBinaryOperator(string filename, uint startLine, uint startIndex, uint endLine, uint endIndex, out bool pIsOp)
+        {
+            var ast = GetModule(filename);
+
+            if (ast == null)
+                throw new COMException("module not found", 1);
+
+            //MessageBox.Show("IsBinaryOperator()");
+            throw new NotImplementedException();
+        }
+        public void GetBinaryIsInLocations(string filename, out uint[] locs) // array of pairs of DWORD
 		{
 			//MessageBox.Show("GetBinaryIsInLocations()");
 			locs = null;
 			//throw new COMException("No Message", 1);
 		}
-		public void GetLastMessage(out string message)
+		
+        public void GetLastMessage(out string message)
 		{
 			//MessageBox.Show("GetLastMessage()");
 			message = "__no_message__"; // avoid throwing exception
 			//throw new COMException("No Message", 1);
 		}
+
 		public void GetDefinition(string filename, int startLine, int startIndex, int endLine, int endIndex)
 		{
 			var ast = GetModule(filename);
@@ -332,17 +344,80 @@ public void GetDefinition(string filename, int startLine, int startIndex, int en
 					_tipText.Append((node as DModule).FileName);
 			}
 		}
-
 		public void GetDefinitionResult(out int startLine, out int startIndex, out int endLine, out int endIndex, out string filename)
 		{
 			startLine = _tipStart.Line;
 			startIndex = _tipStart.Column - 1;
 			endLine = _tipEnd.Line;
 			endIndex = _tipEnd.Column - 1;
 			filename = _tipText.ToString();
-		}
+		}
+
+        public void GetReferences(string filename, string tok, uint line, uint idx, string expr)
+        {
+            var ast = GetModule(filename);
+
+            if (ast == null)
+                throw new COMException("module not found", 1);
+
+            _setupEditorData();
+            CodeLocation loc = new CodeLocation((int)idx + 1, (int)line);
+            _editorData.CaretLocation = loc;
+            _editorData.SyntaxTree = ast as DModule;
+            _editorData.ModuleCode = _sources[filename];
+            _editorData.CaretOffset = getCodeOffset(_editorData.ModuleCode, loc);
+
+            _references = null;
+
+            ISyntaxRegion sr;
+            DResolver.NodeResolutionAttempt attempt;
+			var rr = DResolver.ResolveTypeLoosely(_editorData, out attempt, out sr);
+
+            StringBuilder refs = new StringBuilder();
+			if (rr != null)
+			{
+				var n = DResolver.GetResultMember(rr, true);
 
-		///////////////////////////////////
+				if (n != null)
+                {
+                    var ctxt = ResolutionContext.Create(_editorData, true);
+                    if (n.ContainsAttribute(DTokens.Private) || ((n is DVariable) && (n as DVariable).IsLocal))
+                    {
+                        GetReferencesInModule(ast, refs, n, ctxt);
+                    }
+                    else
+                    {
+                        foreach (var basePath in _imports.Split('\n'))
+                            foreach (var mod in GlobalParseCache.EnumModulesRecursively(basePath))
+                                GetReferencesInModule(mod, refs, n, ctxt);
+                    }
+                }
+                //var res = TypeReferenceFinder.Scan(_editorData, System.Threading.CancellationToken.None, null);
+            }
+            _references = refs;
+        }
+
+        private static void GetReferencesInModule(DModule ast, StringBuilder refs, DNode n, ResolutionContext ctxt)
+        {
+            var res = ReferencesFinder.Scan(ast, n, ctxt);
+
+            int cnt = res.Count();
+            foreach (var r in res)
+            {
+                var rfilename = ast.FileName;
+                var rloc = r.Location;
+                var ln = String.Format("{0},{1},{2},{3}:{4}\n", rloc.Line, rloc.Column - 1, rloc.Line, rloc.Column, rfilename);
+                refs.Append(ln);
+            }
+        }
+        public void GetReferencesResult(out string stringList)
+        {
+            stringList = _references != null ? _references.ToString() : null;
+            //MessageBox.Show("GetSemanticExpansionsResult()");
+            //throw new NotImplementedException();
+        }
+
+        ///////////////////////////////////
 		void _setupEditorData()
 		{
 			string versions = _versionIds;
diff --git a/vdc/ivdserver.d b/vdc/ivdserver.d
@@ -164,6 +164,18 @@ public:
 	//
 	// return S_FALSE as long as the semantic analysis is still running
 	HRESULT GetDefinitionResult(ref int startLine, ref int startIndex, ref int endLine, ref int endIndex, BSTR* filename);
+
+	// request a list of references for a given text location
+	//
+	// filename:   file name 
+	// tok:        the identifier to reference
+	// line, idx:  the location of the caret in the text editor
+	// expr:       the expression to evaluate at the insertion point in case of parser issues
+	//             with the current text
+	// it is assumed that the reference finding is forwarded to some other thread
+	// and that the status can be polled by GetReferencesResult
+	HRESULT GetReferences(in BSTR filename, in BSTR tok, uint line, uint idx, in BSTR expr);
+	HRESULT GetReferencesResult(BSTR* stringList);
 }
 
 ///////////////////////////////////////////////////////////////////////
diff --git a/vdc/vdserver.d b/vdc/vdserver.d
@@ -603,6 +603,16 @@ class VDServer : ComObject, IVDServer
 		return S_OK;
 	}
 
+	HRESULT GetReferences(in BSTR filename, in BSTR tok, uint line, uint idx, in BSTR expr)
+	{
+		return E_NOTIMPL;
+	}
+
+	HRESULT GetReferencesResult(BSTR* stringList)
+	{
+		return E_NOTIMPL;
+	}
+
 	///////////////////////////////////////////////////////////////
 	// create our own task pool to be able to destroy it (it keeps a the
 	//  arguments to the last task, so they are never collected)
diff --git a/vdc/vdserver.idl b/vdc/vdserver.idl
@@ -32,6 +32,8 @@ interface IVDServer : IUnknown
 	HRESULT GetLastMessage([out,retval] BSTR* message);
 	HRESULT GetDefinition([in] BSTR filename, [in] DWORD startLine, [in] DWORD startIndex, [in] DWORD endLine, [in] DWORD endIndex);
 	HRESULT GetDefinitionResult([out] DWORD *startLine, [out] DWORD *startIndex, [out] DWORD *endLine, [out] DWORD *endIndex, [out,retval] BSTR* filename);
+	HRESULT GetReferences([in] BSTR filename, [in] BSTR tok, [in] DWORD line, [in] DWORD idx, [in] BSTR expr);
+	HRESULT GetReferencesResult([out,retval] BSTR* stringList);
 };
 
 // library statement
diff --git a/visuald/dlangsvc.d b/visuald/dlangsvc.d
@@ -763,6 +763,12 @@ class LanguageService : DisposingComObject,
 		wstring expr = src.FindExpressionBefore(line, idx);
 		return vdServerClient.GetSemanticExpansions(src.GetFileName(), tok, line, idx, expr, cb);
 	}
+	uint GetReferences(Source src, string tok, int line, int idx, GetReferencesCallBack cb)
+	{
+		ConfigureSemanticProject(src);
+		wstring expr;
+		return vdServerClient.GetReferences(src.GetFileName(), tok, line, idx, expr, cb);
+	}
 	void UpdateSemanticModule(Source src)
 	{
 	}
diff --git a/visuald/dpackage.d b/visuald/dpackage.d
@@ -1044,7 +1044,13 @@ version(none)
 		assert(s_instance);
 		return s_instance.mLibInfos;
 	}
-	
+
+	static Library GetLibrary()
+	{
+		assert(s_instance);
+		return s_instance.mLibrary;
+	}
+
 	static void scheduleUpdateLibrary()
 	{
 		assert(s_instance);
diff --git a/visuald/library.d b/visuald/library.d
diff --git a/visuald/vdserverclient.d b/visuald/vdserverclient.d
diff --git a/visuald/viewfilter.d b/visuald/viewfilter.d
diff --git a/visuald/visuald.visualdproj b/visuald/visuald.visualdproj

Original file line number	Diff line number	Diff line change
`@@ -763,6 +763,12 @@ class LanguageService : DisposingComObject,`
`763`	`763`	`wstring expr = src.FindExpressionBefore(line, idx);`
`764`	`764`	`return vdServerClient.GetSemanticExpansions(src.GetFileName(), tok, line, idx, expr, cb);`
`765`	`765`	`}`
	`766`	`+ uint GetReferences(Source src, string tok, int line, int idx, GetReferencesCallBack cb)`
	`767`	`+ {`
	`768`	`+ ConfigureSemanticProject(src);`
	`769`	`+ wstring expr;`
	`770`	`+ return vdServerClient.GetReferences(src.GetFileName(), tok, line, idx, expr, cb);`
	`771`	`+ }`
`766`	`772`	`void UpdateSemanticModule(Source src)`
`767`	`773`	`{`
`768`	`774`	`}`