* bugzilla 13342: mixin error message now interpreted

  * when running/unittesting from within visuald, exception/callstack locations can be jumped to
  * bugzilla 13213: there are now both "goto definition" and "goto declaration", where the former
    will try to find the forward declared symbols through the object browser (including C/C++)
  * object browser/symbol search: now filters out __unittest and __invariant symbols

Author: rainers

CHANGES

@@ -690,4 +690,9 @@ unreleased Version 0.3.40
   * DMD/x64 linker override settings not saved
   * revamped pipedmd: now uses tracker.exe from MSBuild or WinSDK to monitor dependencies
   * Win32/COFF support: check box on Compiler->Output page, new tab in global options
-  * bugzilla 13817: VisualD cannot list members with utf-8 wide characters
+  * bugzilla 13817: VisualD cannot list members with utf-8 wide characters
+  * bugzilla 13342: mixin error message now interpreted
+  * when running/unittesting from within visuald, exception/callstack locations can be jumped to
+  * bugzilla 13213: there are now both "goto definition" and "goto declaration", where the former
+    will try to find the forward declared symbols through the object browser (including C/C++)
+  * object browser/symbol search: now filters out __unittest and __invariant symbols

TODO

@@ -167,6 +167,6 @@ Unsorted
 - jump to assertion error
 + import std.container: jump to package
 - renaming configuration does not change project config
-- win32coff support
++ win32coff support
 - file search: replace . with \ in path search?
-- run cv2pdb disabled for GDC/x64
++ run cv2pdb disabled for GDC/x64

vdc/abothe/comserver/VDServer.cs

@@ -314,7 +314,16 @@ public void GetDefinition(string filename, int startLine, int startIndex, int en
 				if (n == null)
 					return;
 
-				_tipStart = n.Location;
+				bool decl = false;
+				var mthd = n as DMethod;
+				if (mthd != null)
+					decl = mthd.Body == null;
+				else if (n.ContainsAttribute(DTokens.Extern))
+					decl = true;
+				if (decl)
+					_tipText.Append("EXTERN:");
+
+                _tipStart = n.Location;
 				_tipEnd = n.EndLocation;
 				INode node = n.NodeRoot;
 				if(node is DModule)

visuald/build.d

@@ -1029,18 +1029,55 @@ bool parseOutputStringForTaskItem(string outputLine, out uint nPriority,
 	outputLine = strip(outputLine);
 
 	// DMD compile error
-	static Regex!char re1dmd, re1gdc, re2, re3, re4;
+	__gshared static Regex!char re1dmd, re1gdc, remixin, re2, re3, re4, re5, re6;
+
+	if(!isInitializedRE(remixin))
+		remixin = regex(r"^(.*?)-mixin-([0-9]+)\(([0-9]+)\):(.*)$");
+
+	auto rematch = match(outputLine, remixin);
+	if(!rematch.empty())
+	{
+		auto captures = rematch.captures();
+		filename = replace(captures[1], "\\\\", "\\");
+		string lineno = captures[2];
+		string lineno2 = captures[3];
+		nLineNum = to!uint(lineno);
+		uint nMixinLine = to!uint(lineno2) - nLineNum + 1;
+		itemText = "mixin(" ~ to!string(nMixinLine) ~ ") " ~ strip(captures[4]);
+		if(itemText.startsWith("Warning:")) // make these errors if not building with -wi?
+			nPriority = TP_NORMAL;
+		else
+			nPriority = TP_HIGH;
+		return true;
+	}
+
+	// exception/error when running
+	if(!isInitializedRE(re5))
+		re5 = regex(r"^[^ @]*@(.*?)\(([0-9]+)\):(.*)$");
+
+	rematch = match(outputLine, re5);
+	if(!rematch.empty())
+	{
+		auto captures = rematch.captures();
+		nPriority = TP_HIGH;
+		filename = replace(captures[1], "\\\\", "\\");
+		string lineno = captures[2];
+		nLineNum = to!uint(lineno);
+		itemText = strip(captures[3]);
+		return true;
+	}
+
 	if(!isInitializedRE(re1dmd))
 		re1dmd = regex(r"^(.*?)\(([0-9]+)\):(.*)$"); // replace . with [\x00-\x7f] for std.regex
 	if(!isInitializedRE(re1gdc))
 		re1gdc = regex(r"^(.*?):([0-9]+):(.*)$");
 
-	auto rematch = match(outputLine, compiler == Compiler.GDC ? re1gdc : re1dmd);
+	rematch = match(outputLine, compiler == Compiler.GDC ? re1gdc : re1dmd);
 	if(!rematch.empty())
 	{
 		auto captures = rematch.captures();
 		filename = replace(captures[1], "\\\\", "\\");
-		string lineno = replace(captures[2], "\\\\", "\\");
+		string lineno = captures[2];
 		nLineNum = to!uint(lineno);
 		itemText = strip(captures[3]);
 		if(itemText.startsWith("Warning:")) // make these errors if not building with -wi?
@@ -1074,7 +1111,7 @@ bool parseOutputStringForTaskItem(string outputLine, out uint nPriority,
 		auto captures = rematch.captures();
 		nPriority = TP_HIGH;
 		filename = replace(captures[1], "\\\\", "\\");
-		string lineno = replace(captures[2], "\\\\", "\\");
+		string lineno = captures[2];
 		nLineNum = to!uint(lineno);
 		itemText = strip(captures[3]);
 		return true;
@@ -1094,6 +1131,22 @@ bool parseOutputStringForTaskItem(string outputLine, out uint nPriority,
 		return true;
 	}
 
+	// entry in exception call stack
+	if(!isInitializedRE(re6))
+		re6 = regex(r"^0x[0-9a-fA-F]* in .* at (.*?)\(([0-9]+)\)(.*)$");
+
+	rematch = match(outputLine, re6);
+	if(!rematch.empty())
+	{
+		auto captures = rematch.captures();
+		nPriority = TP_LOW;
+		filename = replace(captures[1], "\\\\", "\\");
+		string lineno = captures[2];
+		nLineNum = to!uint(lineno);
+		itemText = strip(captures[3]);
+		return true;
+	}
+
 	return false;
 }
 
@@ -1107,11 +1160,33 @@ unittest
 	assert(nLineNum == 37);
 	assert(strTaskItemText == "huhu");
 
-	rc = parseOutputStringForTaskItem("main.d(10): Error: undefined identifier A, did you mean B?", nPriority, strFilename, nLineNum, strTaskItemText, Compiler.DMD);
+	rc = parseOutputStringForTaskItem("main.d(10): Error: undefined identifier A, did you mean B?", 
+									  nPriority, strFilename, nLineNum, strTaskItemText, Compiler.DMD);
 	assert(rc);
 	assert(strFilename == "main.d");
 	assert(nLineNum == 10);
 	assert(strTaskItemText == "Error: undefined identifier A, did you mean B?");
+
+	rc = parseOutputStringForTaskItem(r"object.Exception@C:\tmp\d\forever.d(28): what?",
+									  nPriority, strFilename, nLineNum, strTaskItemText, Compiler.DMD);
+	assert(rc);
+	assert(strFilename == r"C:\tmp\d\forever.d");
+	assert(nLineNum == 28);
+	assert(strTaskItemText == "what?");
+
+	rc = parseOutputStringForTaskItem(r"0x004020C8 in void test.__modtest() at C:\tmp\d\forever.d(34)",
+									  nPriority, strFilename, nLineNum, strTaskItemText, Compiler.DMD);
+	assert(rc);
+	assert(strFilename == r"C:\tmp\d\forever.d");
+	assert(nLineNum == 34);
+	assert(strTaskItemText == "");
+
+	rc = parseOutputStringForTaskItem(r"D:\LuaD\luad\conversions\structs.d-mixin-36(36): Error: cast(MFVector)(*_this).x is not an lvalue",
+									  nPriority, strFilename, nLineNum, strTaskItemText, Compiler.DMD);
+	assert(rc);
+	assert(strFilename == r"D:\LuaD\luad\conversions\structs.d");
+	assert(nLineNum == 36);
+	assert(strTaskItemText == "mixin(1) Error: cast(MFVector)(*_this).x is not an lvalue");
 }
 
 string unEscapeFilename(string file)

visuald/dlangsvc.d

@@ -1615,7 +1615,7 @@ version(threadedOutlining) {} else
 		return rgns;
 	}
 
-	unittest
+	version(none) unittest
 	{
 		const(void)* p = typeid(NewHiddenRegion).rtInfo;
 		assert(p !is rtinfoNoPointers && p !is rtinfoHasPointers);

visuald/hierutil.d

@@ -550,7 +550,7 @@ HRESULT FindFileInSolution(string filename, string srcfile, out string absPath)
 	return S_OK;
 }
 
-HRESULT OpenFileInSolution(string filename, int line, string srcfile = "", bool adjustLineToChanges = false)
+HRESULT OpenFileInSolution(string filename, int line, int col = 0, string srcfile = "", bool adjustLineToChanges = false)
 {
 	// Get the IVsUIShellOpenDocument service so we can ask it to open a doc window
 	IVsUIShellOpenDocument pIVsUIShellOpenDocument = queryService!(IVsUIShellOpenDocument);
@@ -609,7 +609,7 @@ HRESULT OpenFileInSolution(string filename, int line, string srcfile = "", bool
 		if(auto src = Package.GetLanguageService().GetSource(textBuffer))
 			line = src.adjustLineNumberSinceLastBuild(line, false);
 
-	return NavigateTo(textBuffer, line, 0, line, 0);
+	return NavigateTo(textBuffer, line, col, line, col);
 }
 
 HRESULT NavigateTo(IVsTextBuffer textBuffer, int line1, int col1, int line2, int col2)
@@ -622,9 +622,9 @@ HRESULT NavigateTo(IVsTextBuffer textBuffer, int line1, int col1, int line2, int
 	return textmgr.NavigateToLineAndColumn(textBuffer, &LOGVIEWID_Primary, line1, col1, line2, col2);
 }
 
-HRESULT OpenFileInSolutionWithScope(string fname, int line, string scop, bool adjustLineToChanges = false)
+HRESULT OpenFileInSolutionWithScope(string fname, int line, int col, string scop, bool adjustLineToChanges = false)
 {
-	HRESULT hr = OpenFileInSolution(fname, line, "", adjustLineToChanges);
+	HRESULT hr = OpenFileInSolution(fname, line, col, "", adjustLineToChanges);
 
 	if(hr != S_OK && !isAbsolute(fname) && scop.length)
 	{
@@ -642,7 +642,7 @@ HRESULT OpenFileInSolutionWithScope(string fname, int line, string scop, bool ad
 		if(i < path.length)
 		{
 			fname = fname[i .. $];
-			hr = OpenFileInSolution(fname, line, "", adjustLineToChanges);
+			hr = OpenFileInSolution(fname, line, col, "", adjustLineToChanges);
 		}
 	}
 	return hr;

visuald/intellisense.d

@@ -18,6 +18,7 @@ import std.algorithm;
 
 import std.regex;
 import std.array;
+import std.path : baseName, stripExtension;
 //import stdext.fred;
 
 import stdext.path;
@@ -930,6 +931,8 @@ class BrowseInfo
 				if(v.type == JSON_TYPE.STRING)
 					n.file = v.str;
 			node = n;
+			if("name" !in memberobj)
+				node.name = stripExtension(baseName(n.file));
 		}
 		else if (kind == "class" || kind == "interface")
 		{
@@ -946,16 +949,22 @@ class BrowseInfo
 		}
 		else
 		{
-			node = new BrowseNode;
-version(v40)
 			if(kind == "function")
+			{
+				if(JSONValue* n = "name" in memberobj)
+					if(n.type == JSON_TYPE.STRING)
+						if (n.str.startsWith("__unittest") || n.str.startsWith("__invariant"))
+							return null;
+
 				if(!("endline" in memberobj))
-					kind = "funcdecl";
+					kind = "function decl";
+			}
+			node = new BrowseNode;
 		}
 
 		node.kind = kind;
 		getDeclarationInfo(node, memberobj);
-			
+		
 		return node;
 	}
 
@@ -986,6 +995,9 @@ version(v40)
 					void iterate(JSONValue[string] object, BrowseNode parent)
 					{
 						BrowseNode node = createNode(object);
+						if(!node)
+							return;
+
 						if(parent)
 						{
 							parent.members ~= node;

visuald/library.d

@@ -960,7 +960,7 @@ bool HasFunctionPrototype(string kind)
 		case "deallocator":
 		case "delegate":
 		case "function":
-version(v40)		case "funcdecl":
+		case "function decl":
 			return true;
 		default:
 			return false;
@@ -989,7 +989,7 @@ LIB_LISTTYPE2 GetListType(string kind)
 		case "alias":
 		case "typedef":
 		case "delegate":
-version(v40)		case "funcdecl":
+		case "function decl":
 		case "function":         return LLT_MEMBERS;
 
 		// not expected to show up in json file
@@ -1317,7 +1317,7 @@ class ObjectList : DComObject, IVsSimpleObjectList2
 			case "destructor":
 			case "allocator":
 			case "deallocator":
-version(v40)			case "funcdecl":
+			case "function decl":
 			case "function":         pData.Image = CSIMG_MEMBER; break;
 			case "delegate":         pData.Image = CSIMG_MEMBER; break;
 			case "interface":        pData.Image = CSIMG_INTERFACE; break;
@@ -1546,17 +1546,15 @@ version(v40)			case "funcdecl":
 		/+[out]+/ BOOL *pfOK)
 	{
 		mixin(LogCallMix2);
-version(v40) {		if(SrcType != GS_ANY)
+		if(SrcType != GS_ANY)
 		{
-			if(SrcType == GS_DEFINITION && GetKind(Index) == "funcdecl")
+			if(SrcType == GS_DEFINITION && GetKind(Index) == "function decl")
 				return E_FAIL;
-			if(SrcType == GS_DECLARATION && GetKind(Index) != "funcdecl")
+			if(SrcType == GS_DECLARATION && GetKind(Index) != "function decl")
 				return E_FAIL;
 			if(SrcType != GS_DECLARATION && SrcType != GS_DEFINITION)
 				return E_FAIL;
 		}
-} else {		if(SrcType != GS_ANY && SrcType != GS_DEFINITION)
-			return E_FAIL; }
 		*pfOK = TRUE;
 		return S_OK;
 	}
@@ -1581,7 +1579,7 @@ version(v40) {		if(SrcType != GS_ANY)
 		if(file.length == 0)
 			file = GetInfoFilename(obj);
 
-		return OpenFileInSolution(file, line, modname, true);
+		return OpenFileInSolution(file, line, 0, modname, true);
 	}
 
 	override HRESULT GetContextMenu(in ULONG Index, 
@@ -1893,3 +1891,53 @@ private:
 	BOOL  m_fIsCounterDirty;
 	VSTREELISTITEMCHANGE m_listChanges = { NULINDEX, TCT_NOCHANGE };
 }
+
+Definition[] GetObjectLibraryDefinitions(wstring word)
+{
+	Definition[] defs;
+
+	if(auto objmgr = queryService!(IVsObjectManager))
+	{
+		scope(exit) release(objmgr);
+		if(auto objmgr2 = qi_cast!IVsObjectManager2(objmgr))
+		{
+			scope(exit) release(objmgr2);
+			IVsEnumLibraries2 enumLibs;
+			if(objmgr2.EnumLibraries(&enumLibs) == S_OK)
+			{
+				VSOBSEARCHCRITERIA2 searchOpts;
+				searchOpts.szName = _toUTF16zw(word);
+				searchOpts.eSrchType = SO_ENTIREWORD;
+				searchOpts.grfOptions = VSOBSO_CASESENSITIVE;
+
+				scope(exit) release(enumLibs);
+				DWORD fetched;
+				IVsLibrary2 lib;
+				while(enumLibs.Next(1, &lib, &fetched) == S_OK && fetched == 1)
+				{
+					scope(exit) release(lib);
+					if(auto slib = qi_cast!IVsSimpleLibrary2(lib))
+					{
+						scope(exit) release(slib);
+						IVsSimpleObjectList2 reslist;
+						if(slib.GetList2(LLT_MEMBERS, LLF_USESEARCHFILTER, &searchOpts, &reslist) == S_OK)
+						{
+							scope(exit) release(reslist);
+							ULONG items;
+							if(reslist.GetItemCount(&items) == S_OK && items > 0)
+							{
+								BOOL ok;
+								for(ULONG it = 0; it < items; it++)
+									if(reslist.CanGoToSource(it, GS_DEFINITION, &ok) == S_OK && ok)
+									{
+										
+									}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	return defs;
+}

visuald/searchsymbol.d

@@ -1174,7 +1174,7 @@ private:
 	HRESULT _OpenSolutionItem(string pszPath, int line, string scop)
 	{
 		HRESULT hr = S_OK;
-		hr = OpenFileInSolutionWithScope(pszPath, line, scop, true);
+		hr = OpenFileInSolutionWithScope(pszPath, line, 0, scop, true);
 		if(hr == S_OK && _closeOnReturn)
 			sWindowFrame.Hide();
 		return hr;