Merge pull request #129 from rainers/master

rainers · web-flow · commit bcca1980053e · 2020-08-23T08:52:48.000+02:00
Visual D 1.0.1
diff --git a/CHANGES b/CHANGES
@@ -1268,12 +1268,16 @@ Version history
   * installer:
     - full installer now bundled with dmd 2.092.1 and LDC 1.22.0
 
-unreleased version 1.0.1
+2020-08-21 version 1.0.1
   * projects:
     - bugzilla 21024: VS2017/2019 new project: fixed unrelated files listed in New Project Dialog
     - bugzilla 21028: project templates not visible when VS started as standard/restricted user
   * dmdserver:
-    - updated to dmd 2.093
+    - updated to DMD 2.093.1
     - fixed showing documentation for template functions
+  * editor:
+    - now extra mouse buttons to navigate backward/forward supported
   * mago debugger expression evaluator:
     - fixed wrong values displayed eventually when switching stack frames
+  * installer:
+    - full installer now bundled with DMD 2.091.1 and LDC 1.23.0
diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
 #define VERSION_MAJOR      1
 #define VERSION_MINOR      0
 #define VERSION_REVISION   1
-#define VERSION_BETA       -beta
-#define VERSION_BUILD      1
+#define VERSION_BETA       
+#define VERSION_BUILD      0
diff --git a/nsis/visuald.nsi b/nsis/visuald.nsi
@@ -29,12 +29,12 @@
 
 ; define DMD source path to include dmd installation
 ; !define DMD 
-!define DMD_VERSION "2.093.0"
+!define DMD_VERSION "2.093.1"
 !define DMD_SRC c:\d\dmd-${DMD_VERSION}
 
 ; define LDC to include ldc installation
 ; !define LDC
-!define LDC_VERSION "1.22.0"
+!define LDC_VERSION "1.23.0"
 !define LDC_SRC c:\d\ldc2-${LDC_VERSION}-windows-multilib
 
 ; define VS2019 to include VS2019 support
diff --git a/tools/pipedmd.d b/tools/pipedmd.d
@@ -61,12 +61,12 @@ string eatArg(string cmd)
 			while (cmd.length && cmd[0] != '"')
 				cmd = cmd[1..$];
 			if (cmd.length)
-				cmd = cmd[1..$];
+				cmd = cmd[1..$];
 		}
 		else
 			cmd = cmd[1..$];
 	}
-	return cmd;
+	return cmd;
 }
 
 version(pipeLink)
@@ -85,7 +85,7 @@ version(pipeLink)
 		int exitCode = runProcess(cmd, null, true, true, false, true, false);
 		return exitCode;
 	}
-
+
 }
 else
 int main(string[] argv)
@@ -313,7 +313,7 @@ int runProcess(string command, string depsfile, bool doDemangle, bool demangleAl
 
 	if(!bSuccess)
 	{
-		printf("failed launching %s\n", szCommand);
+		printf("failed launching %ls\n", szCommand);
 		return 1;
 	}
 
@@ -514,11 +514,11 @@ void processLine(ubyte[] output, ref size_t writepos, bool optlink, int cp)
 							writepos = q;
 							fwrite("\"".ptr, 1, 1, stdout);
 							fwrite(symbolName.ptr, symbolName.length, 1, stdout);
-							fwrite("\" (".ptr, 3, 1, stdout);
+							fwrite("\" (".ptr, 3, 1, stdout);
 							if(p > writepos)
 								fwrite(output.ptr + writepos, p - writepos, 1, stdout);
 							writepos = p;
-							fwrite(")".ptr, 1, 1, stdout);
+							fwrite(")".ptr, 1, 1, stdout);
 						}
 						else
 						{
@@ -531,7 +531,7 @@ void processLine(ubyte[] output, ref size_t writepos, bool optlink, int cp)
 							writepos = p;
 							fwrite(" (".ptr, 2, 1, stdout);
 							fwrite(symbolName.ptr, symbolName.length, 1, stdout);
-							fwrite(")".ptr, 1, 1, stdout);
+							fwrite(")".ptr, 1, 1, stdout);
 						}
 					}
 				}
@@ -609,7 +609,7 @@ string findTracker(bool x64, ref string trackerArgs)
 	if (!exe.empty && isExe64bit(exe) != x64)
 		exe = null;
 	if (exe.indexOf("14.0") >= 0)
-		trackerArgs = x64 ? " /d FileTracker64.dll" : " /d FileTracker32.dll";
+		trackerArgs = x64 ? " /d FileTracker64.dll" : " /d FileTracker32.dll";
 
 	if (exe.empty)
 		exe = findTrackerInVS2017();
@@ -646,7 +646,7 @@ string findTrackerInMSBuild(const(wchar)* keyname, bool x64, string* trackerArgs
 	string path = readRegistry(keyname, "MSBuildToolsPath"w.ptr, x64);
 	string exe = trackerPath(path, x64);
 	if (exe && trackerArgs)
-		*trackerArgs = x64 ? " /d FileTracker64.dll" : " /d FileTracker32.dll";
+		*trackerArgs = x64 ? " /d FileTracker64.dll" : " /d FileTracker32.dll";
 	return exe;
 }
 
@@ -659,7 +659,7 @@ string findTrackerInVS2017()
 	string exe = dir ~ r"MSBuild\15.0\Bin\Tracker.exe";
 	if (!std.file.exists(exe))
 		return null;
-	// can handle both x86 and x64
+	// can handle both x86 and x64
 	return exe;
 }
 
diff --git a/vdc/dmdserver/dmd b/vdc/dmdserver/dmd
@@ -1 +1 @@
-Subproject commit a98a109995916a6512a2319f4b6cd53c5a149930
+Subproject commit 43c6d688268b659317d8ea9a238642ee4067126b
diff --git a/vdextensions/gotodef.cs b/vdextensions/gotodef.cs
@@ -180,6 +180,7 @@ internal sealed class GoToDefMouseHandlerProvider : IMouseProcessorProvider
         public IMouseProcessor GetAssociatedProcessor(IWpfTextView view)
         {
             var buffer = view.TextBuffer;
+            IVsUIShell vsUIShell = GetVsUIShell();
 
             IOleCommandTarget shellCommandDispatcher = GetShellCommandDispatcher(view);
 
@@ -196,6 +197,7 @@ public IMouseProcessor GetAssociatedProcessor(IWpfTextView view)
 
 			return new GoToDefMouseHandler(view,
                                            shellCommandDispatcher,
+                                           vsUIShell,
                                            _aggregatorFactory.GetClassifier(buffer),
                                            _navigatorService.GetTextStructureNavigator(buffer),
                                            CtrlKeyState.GetStateForView(view));
@@ -211,26 +213,36 @@ private IOleCommandTarget GetShellCommandDispatcher(ITextView view)
             return _globalServiceProvider.GetService(typeof(SUIHostCommandDispatcher)) as IOleCommandTarget;
         }
 
+        /// <summary>
+        /// Get the SVsUIShell from the global service provider.
+        /// </summary>
+        private IVsUIShell GetVsUIShell()
+        {
+            return _globalServiceProvider.GetService(typeof(SVsUIShell)) as IVsUIShell;
+        }
+
         #endregion
     }
 
-    /// <summary>
-    /// Handle ctrl+click on valid elements to send GoToDefinition to the shell.  Also handle mouse moves
-    /// (when control is pressed) to highlight references for which GoToDefinition will (likely) be valid.
-    /// </summary>
-    internal sealed class GoToDefMouseHandler : MouseProcessorBase
+/// <summary>
+/// Handle ctrl+click on valid elements to send GoToDefinition to the shell.  Also handle mouse moves
+/// (when control is pressed) to highlight references for which GoToDefinition will (likely) be valid.
+/// </summary>
+internal sealed class GoToDefMouseHandler : MouseProcessorBase
     {
         private IWpfTextView _view;
         private CtrlKeyState _state;
         private IClassifier _aggregator;
         private ITextStructureNavigator _navigator;
         private IOleCommandTarget _commandTarget;
+        private IVsUIShell _vsUIShell;
 
-        public GoToDefMouseHandler(IWpfTextView view, IOleCommandTarget commandTarget, 
+        public GoToDefMouseHandler(IWpfTextView view, IOleCommandTarget commandTarget, IVsUIShell vsUIShell,
             IClassifier aggregator, ITextStructureNavigator navigator, CtrlKeyState state)
         {
             _view = view;
             _commandTarget = commandTarget;
+            _vsUIShell = vsUIShell;
             _state = state;
             _aggregator = aggregator;
             _navigator = navigator;
@@ -315,12 +327,34 @@ public override void PreprocessMouseUp(MouseButtonEventArgs e)
             _mouseDownAnchorPoint = null;
         }
 
+        // Support backward/forward navigation via extended mouse buttons.
+        // Derived from https://github.com/tunnelvisionlabs/MouseNavigation/blob/master/Tvl.VisualStudio.MouseNavigation/MouseNavigationProcessor.cs.
+        public override void PostprocessMouseUp(MouseButtonEventArgs e)
+        {
+            if (_vsUIShell == null)
+                return;
+
+            uint cmdId;
+            if (e.ChangedButton == MouseButton.XButton1)
+                cmdId = (uint) VSConstants.VSStd97CmdID.ShellNavBackward;
+            else if (e.ChangedButton == MouseButton.XButton2)
+                cmdId = (uint) VSConstants.VSStd97CmdID.ShellNavForward;
+            else
+                return;
+
+            object obj = null;
+            _vsUIShell.PostExecCommand(VSConstants.GUID_VSStandardCommandSet97, cmdId,
+                (uint) OLECMDEXECOPT.OLECMDEXECOPT_DONTPROMPTUSER, ref obj);
+
+            e.Handled = true;
+        }
+
 
-        #endregion
+    #endregion
 
-        #region Private helpers
+    #region Private helpers
 
-        private Point RelativeToView(Point position)
+    private Point RelativeToView(Point position)
         {
             return new Point(position.X + _view.ViewportLeft, position.Y + _view.ViewportTop);
         }

Original file line number	Diff line number	Diff line change
`@@ -61,12 +61,12 @@ string eatArg(string cmd)`
`61`	`61`	`while (cmd.length && cmd[0] != '"')`
`62`	`62`	`cmd = cmd[1..$];`
`63`	`63`	`if (cmd.length)`
`64`		`- cmd = cmd[1..$];`
	`64`	`+ cmd = cmd[1..$];`
`65`	`65`	`}`
`66`	`66`	`else`
`67`	`67`	`cmd = cmd[1..$];`
`68`	`68`	`}`
`69`		`- return cmd;`
	`69`	`+ return cmd;`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`version(pipeLink)`
`@@ -85,7 +85,7 @@ version(pipeLink)`
`85`	`85`	`int exitCode = runProcess(cmd, null, true, true, false, true, false);`
`86`	`86`	`return exitCode;`
`87`	`87`	`}`
`88`		`-`
	`88`	`+`
`89`	`89`	`}`
`90`	`90`	`else`
`91`	`91`	`int main(string[] argv)`
`@@ -313,7 +313,7 @@ int runProcess(string command, string depsfile, bool doDemangle, bool demangleAl`
`313`	`313`
`314`	`314`	`if(!bSuccess)`
`315`	`315`	`{`
`316`		`- printf("failed launching %s\n", szCommand);`
	`316`	`+ printf("failed launching %ls\n", szCommand);`
`317`	`317`	`return 1;`
`318`	`318`	`}`
`319`	`319`
`@@ -514,11 +514,11 @@ void processLine(ubyte[] output, ref size_t writepos, bool optlink, int cp)`
`514`	`514`	`writepos = q;`
`515`	`515`	`fwrite("\"".ptr, 1, 1, stdout);`
`516`	`516`	`fwrite(symbolName.ptr, symbolName.length, 1, stdout);`
`517`		`- fwrite("\" (".ptr, 3, 1, stdout);`
	`517`	`+ fwrite("\" (".ptr, 3, 1, stdout);`
`518`	`518`	`if(p > writepos)`
`519`	`519`	`fwrite(output.ptr + writepos, p - writepos, 1, stdout);`
`520`	`520`	`writepos = p;`
`521`		`- fwrite(")".ptr, 1, 1, stdout);`
	`521`	`+ fwrite(")".ptr, 1, 1, stdout);`
`522`	`522`	`}`
`523`	`523`	`else`
`524`	`524`	`{`
`@@ -531,7 +531,7 @@ void processLine(ubyte[] output, ref size_t writepos, bool optlink, int cp)`
`531`	`531`	`writepos = p;`
`532`	`532`	`fwrite(" (".ptr, 2, 1, stdout);`
`533`	`533`	`fwrite(symbolName.ptr, symbolName.length, 1, stdout);`
`534`		`- fwrite(")".ptr, 1, 1, stdout);`
	`534`	`+ fwrite(")".ptr, 1, 1, stdout);`
`535`	`535`	`}`
`536`	`536`	`}`
`537`	`537`	`}`
`@@ -609,7 +609,7 @@ string findTracker(bool x64, ref string trackerArgs)`
`609`	`609`	`if (!exe.empty && isExe64bit(exe) != x64)`
`610`	`610`	`exe = null;`
`611`	`611`	`if (exe.indexOf("14.0") >= 0)`
`612`		`- trackerArgs = x64 ? " /d FileTracker64.dll" : " /d FileTracker32.dll";`
	`612`	`+ trackerArgs = x64 ? " /d FileTracker64.dll" : " /d FileTracker32.dll";`
`613`	`613`
`614`	`614`	`if (exe.empty)`
`615`	`615`	`exe = findTrackerInVS2017();`
`@@ -646,7 +646,7 @@ string findTrackerInMSBuild(const(wchar)* keyname, bool x64, string* trackerArgs`
`646`	`646`	`string path = readRegistry(keyname, "MSBuildToolsPath"w.ptr, x64);`
`647`	`647`	`string exe = trackerPath(path, x64);`
`648`	`648`	`if (exe && trackerArgs)`
`649`		`- *trackerArgs = x64 ? " /d FileTracker64.dll" : " /d FileTracker32.dll";`
	`649`	`+ *trackerArgs = x64 ? " /d FileTracker64.dll" : " /d FileTracker32.dll";`
`650`	`650`	`return exe;`
`651`	`651`	`}`
`652`	`652`
`@@ -659,7 +659,7 @@ string findTrackerInVS2017()`
`659`	`659`	`string exe = dir ~ r"MSBuild\15.0\Bin\Tracker.exe";`
`660`	`660`	`if (!std.file.exists(exe))`
`661`	`661`	`return null;`
`662`		`- // can handle both x86 and x64`
	`662`	`+ // can handle both x86 and x64`
`663`	`663`	`return exe;`
`664`	`664`	`}`
`665`	`665`