Merge pull request #71 from rainers/master

rainers · web-flow · commit 4a1981644f35 · 2017-03-12T12:48:12.000+01:00
Version v0.44
diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
 #define VERSION_MAJOR      0
 #define VERSION_MINOR      44
 #define VERSION_REVISION   0
-#define VERSION_BETA       -rc
-#define VERSION_BUILD      2
+#define VERSION_BETA       
+#define VERSION_BUILD      0
diff --git a/doc/BuildFromSource.dd b/doc/BuildFromSource.dd
@@ -1,54 +1,55 @@
 Ddoc
 
-$(P The latest sources of Visual D are available from the github repository at 
+$(P The latest sources of Visual D are available from the github repository at
 $(LINK2 https://github.com/dlang/visuald, https://github.com/dlang/visuald).)
 
 $(H2 Prerequisites)
 
 $(P You need the following tools to build Visual D:)
 $(UL
-  $(LI Visual Studio 2008/2010/2012 (other version might also work, but I haven't tried a lot))
-  $(LI $(LINK2 http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=59ec6ec3-4273-48a3-ba25-dc925a45584d, Visual Studio Integration SDK for VS2008)
-  or $(LINK2 http://www.microsoft.com/downloads/en/details.aspx?FamilyID=47305cf4-2bea-43c0-91cd-1b853602dcc5, Visual Studio Integration SDK for VS2010))
-  $(LI Windows SDK 6.0A (included in VS2008) or SDK 7.0A (included in VS2010) or SDK v7.1 (included in the Windows 7 SDK), other versions might also work.)
-  $(LI DMD 2.059 or newer)
+  $(LI Visual Studio 2013/2015 (other versions might also work))
+  $(LI $(LINK2 https://www.microsoft.com/en-us/download/details.aspx?id=40758,
+  Visual Studio Integration SDK for VS2013) or enable it during $(LINK2
+  https://msdn.microsoft.com/en-us/library/mt683786.aspx, VS 2015 installation).)
+  $(LI Windows SDK 6.0A (included in VS2008) or later (tested with most versions
+  up to 10.0.14393.0))
+  $(LI DMD 2.066 or newer)
   $(LI coffimplib ($(LINK2 ftp://ftp.digitalmars.com/coffimplib.zip, ftp)))
   $(LI for installer: $(LINK2 http://nsis.sourceforge.net/Download, NSIS))
   $(LI for debugging: $(LINK2 https://github.com/rainers/cv2pdb, cv2pdb))
 )
 
 $(H2 Building Visual D)
 
-$(P The Visual D source code is usually updated to work with the latest release version 
-of DMD (2.059 as of now), so you should use this release of the compiler when using 
+There is an $(LINK2 https://ci.appveyor.com/project/rainers/visuald, AppVeyor project)
+that verifies recent changes to the development
+branch of Visual D. This can also be used as a reference for the build process.
+
+$(P The Visual D source code is usually updated to work with the latest release version
+of DMD (2.073 as of now), so you should use this release of the compiler when using
 the latest svn/git checkout.)
 
-$(P The standard build procedure for the release version is to execute 
-"nmake" in the trunk directory. $(B Please check the variable settings at the 
+$(P The standard build procedure for the release version is to execute
+"nmake install_vs" in the trunk directory. $(B Please check the variable settings at the
 top of the Makefile and adjust them to the installation directories on your system.))
 
-$(P If you want to start developing or debugging, you should execute
-"$(B nmake sdk)" at least once to build the necessary D translations from
-the Windows and Visual Studio SDK. Afterwards you can use Visual D itself with the 
-solution visuald_vs9.sln or visuald_vs10.sln, respectively.)
+$(P If you want to start developing or debugging, you should load visuald_vs10.sln
+in Visual Studio with Visual D installed. Build the "build" project at least once
+to build the necessary prerequisites and tools, e.g. D translations from
+the Windows and Visual Studio SDK.)
 
 $(H3 Known issues)
 $(UL
- $(LI building the parser library with stock DMD before 2.066 causes an "Out of memory" error. There are two 
-   options how to fix this:
+ $(LI building the parser library with stock DMD before 2.066 and after 2.068 might cause
+   an "Out of memory" error. There are two options how to fix this:
   $(UL
-   $(LI enable the LARGE_ADDRESS_AWARE bit inside dmd.exe with this simple tool: 
-    $(LINK https://github.com/dlang/visuald/blob/master/tools/largeadr.d) (if you are running a 
+   $(LI enable the LARGE_ADDRESS_AWARE bit inside dmd.exe with this simple tool:
+    $(LINK https://github.com/dlang/visuald/blob/master/tools/largeadr.d) (if you are running a
 	32-bit OS, you will also need to boot with the /3GB switch))
-   $(LI build DMD with the Microsoft compiler instead of the Digital Mars compiler 
+   $(LI build DMD with the Microsoft compiler instead of the Digital Mars compiler
     (This also has the benefit of an executable that compiles about twice as fast))
   )
  )
- $(LI building '''pkgcmd.cto''' from pkgcmd.ctc needs CTC.exe from the VS2008 VSI SDK. 
-    This program is no longer available in the 2010 VSI SDK. Therefore, a precompiled version of 
-	pkgcmd.cto is committed. If the build rule fails please make sure pkgcmd.cto  is newer than 
-	pkgcmd.ctc to skip this build step.)
-
  $(LI A druntime patch is necessary for correct name demangling in the profiler window:
   $(UL
    $(LI $(LINK2 http://d.puremagic.com/issues/show_bug.cgi?id=4852, Issue 4852): Support to suppress function signature in the profiler window)
@@ -59,7 +60,7 @@ $(UL
 
 $(H2 Deployment)
 
-$(P You should debug the plugin within Visual Studio 2008/2010 using a different
+$(P You should debug Visual D within Visual Studio 2013/2015 using a different
 branch in the registry, so it does not interfere with your working
 environment.)
 
@@ -77,11 +78,11 @@ $(UL
    )
   )
  )
- $(LI VS2010/VS2012: The mechanism has dramatically changed with VS2010, as the non-standard registry settings are rebuilt 
-   on every start of Visual Studio. 
+ $(LI VS2010-VS2015: The mechanism has changed with VS2010, as the non-standard registry settings are rebuilt
+   on every start of Visual Studio.
   $(UL
-   $(LI Put the files from trunk\nsis\extensions into the folder 
-     $(DOLLAR)(APPDATA)\Local\Microsoft\VisualStudio\10.0D\Extensions\VisualD (replace 10.0D with 11.0D for VS2012))
+   $(LI Put the files from trunk\nsis\extensions into the folder
+     $(DOLLAR)(APPDATA)\Local\Microsoft\VisualStudio\12.0D\Extensions\VisualD (replace 12.0D with 14.0D for VS2015))
    $(LI in visuald.pkgdef, replace the path "M:\\s\\d\\visuald\\trunk\\bin\\debug\\visuald.dll" with your debug build output path.)
    $(LI Start the IDE with the new settings branch via)
     $(PRE devenv /RootSuffix D)
@@ -94,4 +95,4 @@ $(P Good luck!)
 
 Macros:
 	TITLE=Building from Source
-	
+
diff --git a/doc/Features.dd b/doc/Features.dd
@@ -10,20 +10,27 @@ Ddoc
     $(LI pre/post custom build steps)
     $(LI automatic dependency generation)
     $(LI automatic link between dependent projects)
-    $(LI integrates cv2pdb and mago for seamless debugger integration)
     $(LI new project templates)
+    $(LI msbuild integration with VC projects)
    )
   )
 
+  $(LI Project management
+   $(UL
+    $(LI integrates cv2pdb and mago for seamless debugger integration)
+    $(LI or plugs into the VS debug engine as a language extension)
+   )
+  )
   $(LI Language Service
    $(UL
     $(LI syntax highlighting with special version/debug and token string support)
     $(LI underlining of syntactical errors)
-    $(LI word-completion through buffer, JSON compile info or semantic analysis)
+    $(LI word-completion through semantic analysis, buffer, or JSON compile info)
     $(LI import statement completion)
-    $(LI goto definition (using JSON file from compilation or semantic analysis))
+    $(LI goto definition (using semantic analysis or JSON file from compilation))
     $(LI parameter info tooltips)
     $(LI smart indentation)
+    $(LI automatic brace completion)
     $(LI comment/uncomment selection)
     $(LI highlight/jump-to matching braces)
     $(LI code snippets)
@@ -42,23 +49,24 @@ Ddoc
    $(UL
     $(LI C++ to D conversion wizard)
     $(LI Profiler window)
+    $(LI Code Coverage display)
+    $(LI Dustmite integration)
    )
   )
   $(LI Supported Visual Studio versions
    $(UL
-    $(LI VS 2005)
     $(LI VS 2008)
     $(LI VS 2010)
     $(LI VS 2012)
     $(LI VS 2013)
     $(LI VS 2015)
    )
-   Unfortunately, Express versions of Visual Studio do not support this kind of extensions. 
-   But you can use the (integrated) Visual Studio Shell (download 
-   $(LINK2 http://www.microsoft.com/downloads/details.aspx?FamilyID=40646580-97FA-4698-B65F-620D4B4B1ED7&displaylang=en, VS Shell 2008) or 
-   $(LINK2 http://www.microsoft.com/downloads/details.aspx?FamilyID=8e5aa7b6-8436-43f0-b778-00c3bca733d3&displaylang=en, VS Shell 2010) or 
+   Unfortunately, Express versions of Visual Studio do not support this kind of extensions.
+   But you can use the (integrated) Visual Studio Shell (download
+   $(LINK2 http://www.microsoft.com/downloads/details.aspx?FamilyID=40646580-97FA-4698-B65F-620D4B4B1ED7&displaylang=en, VS Shell 2008) or
+   $(LINK2 http://www.microsoft.com/downloads/details.aspx?FamilyID=8e5aa7b6-8436-43f0-b778-00c3bca733d3&displaylang=en, VS Shell 2010) or
    $(LINK2 https://www.microsoft.com/en-us/download/details.aspx?id=30670, VS Shell 2012)), which is the Visual Studio IDE stripped of any
-   language support. 
+   language support.
   )
   $(LI sources include tools to
    $(UL
@@ -76,7 +84,7 @@ Ddoc
    )
   )
  )
- 
+
 
 Macros:
 	TITLE=Major Features
diff --git a/doc/StartPage.dd b/doc/StartPage.dd
@@ -54,7 +54,7 @@ $(H2 News)
 $(P $(LINK2 VersionHistory.html, Full version history and complete details...)
 )
 
-2017-02-06 Version 0.44
+2017-03-12 Version 0.44
 $(UL
   $(LI $(VDLINK vcxproject, integration) with msbuild and Visual C/C++ projects)
   $(LI enhanced $(LINK2 Debugging.html#concord, integration) with the Visual Studio debugger by only adding mago's expression evaluator)
diff --git a/doc/VersionHistory.dd b/doc/VersionHistory.dd
@@ -1,6 +1,6 @@
 Ddoc
 
-$(H2 2017-02-08 Version 0.44)
+$(H2 2017-03-12 Version 0.44)
  $(UL
   $(LI installation
    $(UL
@@ -29,7 +29,7 @@ $(H2 2017-02-08 Version 0.44)
   $(LI cv2pdb:
    $(UL
     $(LI fix crashes with very long symbols)
-    $(LI can now be enabled independent of debug engine)
+    $(LI can now be enabled independently of debug engine)
    ))
   $(LI language service
    $(UL
@@ -45,6 +45,8 @@ $(H2 2017-02-08 Version 0.44)
       $(LI new sorting modes "by type" using classification by the semantic engine,
         "by declaration", effectively using scopes as discovered by the semantic engine)
       $(LI without any match, still keep the completion box open to update when deleting the last character)
+      $(LI less flashing when updating the results)
+      $(LI code snippets now added to possible expansions)
      ))
    ))
   $(LI build
diff --git a/nsis/Extensions/extension.vsixmanifest b/nsis/Extensions/extension.vsixmanifest
@@ -6,7 +6,7 @@
   <Identifier Id="Visual.D">
     <Name>Visual D</Name>
     <Author>Rainer Schuetze</Author>
-    <Version>0.3</Version>
+    <Version>0.44</Version>
     <Description>Extension to provide support for the D programming language.</Description>
     <Locale>1033</Locale>
     <MoreInfoUrl>http://rainers.github.io/visuald/visuald/StartPage.html</MoreInfoUrl>
@@ -31,6 +31,27 @@
         <Edition>VSTS</Edition>
         <Edition>VSTD</Edition>
       </VisualStudio>
+      <VisualStudio Version="12.0">
+        <Edition>Community</Edition>
+        <Edition>Pro</Edition>
+        <Edition>IntegratedShell</Edition>
+        <Edition>VSTS</Edition>
+        <Edition>VSTD</Edition>
+      </VisualStudio>
+      <VisualStudio Version="14.0">
+        <Edition>Community</Edition>
+        <Edition>Pro</Edition>
+        <Edition>IntegratedShell</Edition>
+        <Edition>VSTS</Edition>
+        <Edition>VSTD</Edition>
+      </VisualStudio>
+      <VisualStudio Version="15.0">
+        <Edition>Community</Edition>
+        <Edition>Pro</Edition>
+        <Edition>IntegratedShell</Edition>
+        <Edition>VSTS</Edition>
+        <Edition>VSTD</Edition>
+      </VisualStudio>
     </SupportedProducts>
     <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.0" />
   </Identifier>
diff --git a/visuald/register.d b/visuald/register.d
@@ -688,9 +688,16 @@ version(none){
 			scope RegKey keyMarshal2 = new RegKey(HKEY_CLASSES_ROOT, "CLSID\\"w ~ GUID2wstring(iid) ~ "\\InprocHandler32"w);
 			keyMarshal2.Set(null, dllPath);
 		}
-		registerMarshalObject(g_unmarshalEnumOutCLSID);
-		static if(is(typeof(g_unmarshalTargetInfoCLSID)))
-			registerMarshalObject(g_unmarshalTargetInfoCLSID);
+		try
+		{
+			registerMarshalObject(g_unmarshalEnumOutCLSID);
+			static if(is(typeof(g_unmarshalTargetInfoCLSID)))
+				registerMarshalObject(g_unmarshalTargetInfoCLSID);
+		}
+		catch(Exception)
+		{
+			// silently ignore errors if not running as admin
+		}
 
 		fixVS2012Shellx64Debugger(keyRoot, registrationRoot);
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ $(H2 News)`
`54`	`54`	`$(P $(LINK2 VersionHistory.html, Full version history and complete details...)`
`55`	`55`	`)`
`56`	`56`
`57`		`-2017-02-06 Version 0.44`
	`57`	`+2017-03-12 Version 0.44`
`58`	`58`	`$(UL`
`59`	`59`	`$(LI $(VDLINK vcxproject, integration) with msbuild and Visual C/C++ projects)`
`60`	`60`	`$(LI enhanced $(LINK2 Debugging.html#concord, integration) with the Visual Studio debugger by only adding mago's expression evaluator)`