Merge pull request #270 from rainers/master

rainers · web-flow · commit 733312b546c8 · 2024-02-26T08:26:57.000+01:00
changes for Visual D 1.4.0-rc1
diff --git a/CHANGES b/CHANGES
@@ -1357,3 +1357,13 @@ Version history
   * "add imports from dependent projects" is now evaluated recursively and passed to semantic analysis
   * added support for compiler option -preview=shortenedMethods
   * fixed issue #264: VisualD doesn't run compiled executable, when I select "Compile and Run" option
+
+2024-02-25 version 1.4.0-rc1
+  * dmdserver: updated to frontend of DMD 2.107.0
+  * full installer now bundled with DMD 2.107.0 and LDC 1.36.0
+  * mago: fix crash due to changed return values from IDiaSession in VS2022, probably fixes
+    issue #261
+  * fixed issue #269: avoid BOM in response file if system codepage is UTF-8
+  * project template cache now removed if Visual D does not find itself in it. Workaround for
+    issue #256
+  * fixed some version inaccuracies in installation files
diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
 #define VERSION_MAJOR      1
 #define VERSION_MINOR      4
 #define VERSION_REVISION   0
-#define VERSION_BETA       -beta
-#define VERSION_BUILD      2
+#define VERSION_BETA       -rc
+#define VERSION_BUILD      1
diff --git a/c2d/pp.d b/c2d/pp.d
@@ -375,7 +375,7 @@ class ConditionalCode
 
 	void convertMultipleElseIf()
 	{
-		assert("not implemented");
+		assert(!"not implemented");
 	}
 
 	void convertMultipleOpenElseIf()
diff --git a/msbuild/dbuild/CompileD.cs b/msbuild/dbuild/CompileD.cs
@@ -327,7 +327,12 @@ protected override Encoding ResponseFileEncoding
                 if (Compiler == "LDC")
                     return new UTF8Encoding(false);
                 else
-                    return System.Text.Encoding.GetEncoding(GetACP());
+                {
+                    int cp = GetACP();
+                    if (cp == 65001)
+                        return new UTF8Encoding(false); // no BOM
+                    return System.Text.Encoding.GetEncoding(cp);
+                }
             }
         }
 
diff --git a/nsis/Extensions_vs15/extension.vsixmanifest b/nsis/Extensions_vs15/extension.vsixmanifest
@@ -8,13 +8,13 @@
     <Description xml:space="preserve">Extension to provide support for the D programming language</Description>
   </Metadata>
   <Installation InstalledByMsi="true" AllUsers="true" SystemComponent="false">
-    <InstallationTarget Version="[12.0,17.0)" Id="Microsoft.VisualStudio.VSWinExpress" />
-    <InstallationTarget Version="[12.0,17.0)" Id="Microsoft.VisualStudio.Premium" />
-    <InstallationTarget Version="[12.0,17.0)" Id="Microsoft.VisualStudio.Ultimate" />
-    <InstallationTarget Version="[12.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
-    <InstallationTarget Version="[12.0,17.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
-    <InstallationTarget Version="[12.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
-    <InstallationTarget Version="[12.0,17.0)" Id="Microsoft.VisualStudio.Community" />
+    <InstallationTarget Version="[12.0,18.0)" Id="Microsoft.VisualStudio.VSWinExpress" />
+    <InstallationTarget Version="[12.0,18.0)" Id="Microsoft.VisualStudio.Premium" />
+    <InstallationTarget Version="[12.0,18.0)" Id="Microsoft.VisualStudio.Ultimate" />
+    <InstallationTarget Version="[12.0,18.0)" Id="Microsoft.VisualStudio.Pro" />
+    <InstallationTarget Version="[12.0,18.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
+    <InstallationTarget Version="[12.0,18.0)" Id="Microsoft.VisualStudio.Enterprise" />
+    <InstallationTarget Version="[12.0,18.0)" Id="Microsoft.VisualStudio.Community" />
   </Installation>
   <Assets>
     <Asset Type="Microsoft.VisualStudio.VsPackage" Path="visuald.pkgdef" />
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.106.0"
+!define DMD_VERSION "2.107.0"
 !define DMD_SRC c:\d\dmd-${DMD_VERSION}
 
 ; define LDC to include ldc installation
 ; !define LDC
-!define LDC_VERSION "1.35.0"
+!define LDC_VERSION "1.36.0"
 !define LDC_SRC c:\d\ldc2-${LDC_VERSION}-windows-multilib
 
 ; define VS2019 to include VS2019 support
@@ -80,7 +80,12 @@
     !define VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_BETA}${VERSION_BUILD}"
   !endif
   
-  !echo "VERSION = ${VERSION}"
+;  !define MUI_ICON "Extensions\vdlogo.ico"
+  !define MUI_HEADERIMAGE
+  !define MUI_HEADERIMAGE_BITMAP "Extensions\vdlogo.bmp"
+  !define MUI_HEADERIMAGE_RIGHT
+  !define MUI_HEADERIMAGE_BITMAP_STRETCH AspectFitHeight
+
   !define AUTHOR "Rainer Schuetze"
   !define APPNAME "VisualD"
   !define LONG_APPNAME "Visual D"
@@ -690,7 +695,7 @@ ${MementoSection} "Install in VS 2022" SecVS2022
 
   GetFullPathName $0 $INSTDIR
   !insertmacro ReplaceInFile "$1${EXTENSION_DIR}\extension.vsixmanifest" "VDINSTALLPATH" "$0" NoBackup
-  !insertmacro ReplaceInFile "$1${EXTENSION_DIR}\extension.vsixmanifest" "VSVERSION" "16" NoBackup
+  !insertmacro ReplaceInFile "$1${EXTENSION_DIR}\extension.vsixmanifest" "VSVERSION" "17" NoBackup
   !insertmacro ReplaceInFile "$1${EXTENSION_DIR}\extension.vsixmanifest" "VDVERSION" "${VERSION_MAJOR}.${VERSION_MINOR}" NoBackup
 
   !ifdef MAGO
diff --git a/sdk/vsi.visualdproj b/sdk/vsi.visualdproj
@@ -2223,6 +2223,16 @@
    <File path="vsi\msdbg168.d" />
    <File path="vsi\msdbg169.d" />
    <File path="vsi\msdbg16a.d" />
+   <File path="vsi\msdbg170.d" />
+   <File path="vsi\msdbg171.d" />
+   <File path="vsi\msdbg172.d" />
+   <File path="vsi\msdbg173.d" />
+   <File path="vsi\msdbg174.d" />
+   <File path="vsi\msdbg175.d" />
+   <File path="vsi\msdbg176.d" />
+   <File path="vsi\msdbg177.d" />
+   <File path="vsi\msdbg178.d" />
+   <File path="vsi\msdbg179.d" />
    <File path="vsi\msdbg90.d" />
    <File path="vsi\objext.d" />
    <File path="vsi\ocdesign.d" />
@@ -2294,6 +2304,14 @@
    <File path="vsi\vsshell166.d" />
    <File path="vsi\vsshell167.d" />
    <File path="vsi\vsshell169.d" />
+   <File path="vsi\vsshell171.d" />
+   <File path="vsi\vsshell172.d" />
+   <File path="vsi\vsshell174.d" />
+   <File path="vsi\vsshell175.d" />
+   <File path="vsi\vsshell176.d" />
+   <File path="vsi\vsshell177.d" />
+   <File path="vsi\vsshell178.d" />
+   <File path="vsi\vsshell179.d" />
    <File path="vsi\vsshell2.d" />
    <File path="vsi\vsshell80.d" />
    <File path="vsi\vsshell90.d" />
diff --git a/vdc/dmdserver/dmd b/vdc/dmdserver/dmd
@@ -1 +1 @@
-Subproject commit d7b4caa704f3ada910f8f7d345bb151725df51dc
+Subproject commit 6797df31a98fec0058525395ec1569ad3f3552c3
diff --git a/vdc/dmdserver/dmdserver.visualdproj b/vdc/dmdserver/dmdserver.visualdproj
@@ -1771,7 +1771,7 @@
     <File path="dmd\compiler\src\dmd\common\file.d" />
     <File path="dmd\compiler\src\dmd\common\int128.d" />
     <File path="dmd\compiler\src\dmd\common\outbuffer.d" />
-    <File path="dmd\compiler\src\dmd\common\string.d" />
+    <File path="dmd\compiler\src\dmd\common\smallbuffer.d" />
    </Folder>
    <Folder name="root">
     <File path="dmd\compiler\src\dmd\root\aav.d" />
diff --git a/vdc/dmdserver/semanalysis.d b/vdc/dmdserver/semanalysis.d
@@ -422,7 +422,7 @@ void do_unittests()
 		import dmd.hdrgen;
 		auto buf = OutBuffer();
 		buf.doindent = 1;
-		moduleToBuffer(buf, mod);
+		moduleToBuffer(buf, false, mod);
 
 		OutputDebugStringA(buf.peekChars);
 	}
diff --git a/vdc/dmdserver/semvisitor.d b/vdc/dmdserver/semvisitor.d
@@ -1179,9 +1179,9 @@ TipData tipForDeclaration(Declaration decl)
 		auto fntype = decl.type ? decl.type.isTypeFunction() : null;
 
 		if (auto td = fntype && decl.parent ? decl.parent.isTemplateDeclaration() : null)
-			functionToBufferFull(fntype, buf, decl.getIdent(), &hgs, td);
+			functionToBufferFull(fntype, buf, decl.getIdent(), hgs, td);
 		else if (fntype)
-			functionToBufferWithIdent(fntype, buf, decl.toPrettyChars(true), &hgs, func.isStatic);
+			functionToBufferWithIdent(fntype, buf, decl.toPrettyChars(true), hgs, func.isStatic);
 		else
 			buf.writestring(decl.toPrettyChars(true));
 		auto res = buf.extractSlice(); // take ownership
@@ -2524,7 +2524,7 @@ string[] findExpansions(Module mod, int line, int index, string tok)
 
 				case EXP.dotVariable:
 				case EXP.dotIdentifier:
-					flags |= SearchLocalsOnly;
+					flags |= SearchOpt.localsOnly;
 					if (recursed)
 						if (auto dve = e.isDotVarExp())
 							if (dve.varloc.filename)  // skip compiler generated idents (alias this)
@@ -2534,7 +2534,7 @@ string[] findExpansions(Module mod, int line, int index, string tok)
 					return getType(e1, true);
 
 				case EXP.dot:
-					flags |= SearchLocalsOnly;
+					flags |= SearchOpt.localsOnly;
 					return (cast(DotExp)e).e1.type;
 				default:
 					return recursed ? e.type : null;
@@ -2593,9 +2593,9 @@ string[] findExpansions(Module mod, int line, int index, string tok)
 			{
 				if (!sym)
 					return;
-				int sflags = SearchLocalsOnly;
+				int sflags = SearchOpt.localsOnly;
 				if (sym.getModule() == mod)
-					sflags |= IgnoreSymbolVisibility;
+					sflags |= SearchOpt.ignoreVisibility;
 				searchScope(sym, sflags);
 			}
 			// base classes
@@ -2638,14 +2638,14 @@ string[] findExpansions(Module mod, int line, int index, string tok)
 				}
 			}
 
-			if (flags & SearchLocalsOnly)
+			if (flags & SearchOpt.localsOnly)
 				break;
 
 			// imported modules
 			size_t cnt = sd.importedScopes ? sd.importedScopes.dim : 0;
 			for (size_t i = 0; i < cnt; i++)
 			{
-				if ((flags & IgnorePrivateImports) && sd.visibilities[i] == Visibility.Kind.private_)
+				if ((flags & SearchOpt.ignorePrivateImports) && sd.visibilities[i] == Visibility.Kind.private_)
 					continue;
 				auto ss = (*sd.importedScopes)[i].isScopeDsymbol();
 				if (!ss)
@@ -2654,17 +2654,17 @@ string[] findExpansions(Module mod, int line, int index, string tok)
 				int sflags = 0;
 				if (ss.isModule())
 				{
-					if (flags & SearchLocalsOnly)
+					if (flags & SearchOpt.localsOnly)
 						continue;
-					sflags |= IgnorePrivateImports;
+					sflags |= SearchOpt.ignorePrivateImports;
 				}
 				else // mixin template
 				{
-					if (flags & SearchImportsOnly)
+					if (flags & SearchOpt.importsOnly)
 						continue;
-					sflags |= SearchLocalsOnly;
+					sflags |= SearchOpt.localsOnly;
 				}
-				searchScope(ss, sflags | IgnorePrivateImports);
+				searchScope(ss, sflags | SearchOpt.ignorePrivateImports);
 			}
 		}
 	}
diff --git a/visuald/dpackage.d b/visuald/dpackage.d
@@ -517,6 +517,8 @@ version(none)
 
 		mOptions.initFromRegistry();
 
+		mOptions.checkTemplateCache();
+
 		// debug dumpFontsAndColors();
 
 		//register with ComponentManager for Idle processing
@@ -1918,6 +1920,43 @@ class GlobalOptions
 			baseInstallDir = "c:\\D";
 	}
 
+	bool checkTemplateCache()
+	{
+		bool rc = true;
+		try
+		{
+			if(!getRegistryRoot())
+				return false;
+			if (regUserRoot.toUpper.startsWith("SOFTWARE\\"w))
+			{
+				auto localpath = "$(LOCALAPPDATA)" ~ to!string(regUserRoot[8..$]);
+				localpath = replaceGlobalMacros(localpath);
+				if(isExistingDir(localpath))
+				{
+					string[] toRemove;
+					foreach (string fname; dirEntries(localpath, SpanMode.shallow))
+					{
+						if (globMatch(baseName(fname), "NpdProjectTemplateCache*"))
+						{
+							auto content = cast(ubyte[])std.file.read(fname);
+							if (find(content, cast(ubyte[])"\"Visual D\"").empty)
+								toRemove ~= fname;
+						}
+					}
+					foreach (string fname; toRemove)
+						std.file.remove(fname);
+				}
+			}
+		}
+		catch(Exception e)
+		{
+			writeToBuildOutputPane(e.msg);
+			rc = false;
+		}
+
+		return rc;
+	}
+
 	bool initFromRegistry(bool restoreDefaults = false)
 	{
 		bool rc = true;
diff --git a/visuald/register.d b/visuald/register.d
@@ -335,7 +335,6 @@ static const wstring[] regMiscProjects =
 	"{8C3FFDCC-9A63-43F2-9A3E-C45FB2ABF450}"w, // VC-Windows;WinRT-Common;VC-Native
 	"{dc073cad-303e-4838-9969-278c87bd53eb}"w, // VC-Windows;WinRT-Native-Phone-6.3;WinRT-Common
 	"{F8BBB05E-FBD0-4B36-8C17-0B3F79AD4F01}"w, // VC-Android
-	"{F8BBB05E-FBD0-4B36-8C17-0B3F79AD4F01}"w, // VC-Android
 	"{fae12128-4bbf-454a-b96c-e83e7ad6a783}"w, // VC-Windows;CodeSharing-Native;WinRT-Common
 	"{fe0b9df8-a7c2-4687-a235-316c1aca78d3}"w, // VC-Windows;WinRT-Native-UAP;WinRT-Common
 ];
@@ -535,7 +534,7 @@ HRESULT VSDllRegisterServerInternal(in wchar* pszRegRoot, in bool useRanu)
 	else if (ver == 16)
 		dbuildPath = instPath ~ "\\msbuild\\dbuild.16.0.dll"w;
 	else if (ver == 17)
-		dbuildPath = instPath ~ "\\msbuild\\dbuild.16.0.dll"w;
+		dbuildPath = instPath ~ "\\msbuild\\dbuild.17.0.dll"w;
 
 	wstring vdext15Path;
 	if (ver >= 15)

Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ class ConditionalCode`
`375`	`375`
`376`	`376`	`void convertMultipleElseIf()`
`377`	`377`	`{`
`378`		`- assert("not implemented");`
	`378`	`+ assert(!"not implemented");`
`379`	`379`	`}`
`380`	`380`
`381`	`381`	`void convertMultipleOpenElseIf()`
Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,12 @@ protected override Encoding ResponseFileEncoding`
`327`	`327`	`if (Compiler == "LDC")`
`328`	`328`	`return new UTF8Encoding(false);`
`329`	`329`	`else`
`330`		`- return System.Text.Encoding.GetEncoding(GetACP());`
	`330`	`+ {`
	`331`	`+ int cp = GetACP();`
	`332`	`+ if (cp == 65001)`
	`333`	`+ return new UTF8Encoding(false); // no BOM`
	`334`	`+ return System.Text.Encoding.GetEncoding(cp);`
	`335`	`+ }`
`331`	`336`	`}`
`332`	`337`	`}`
`333`	`338`
Original file line number	Diff line number	Diff line change
`@@ -422,7 +422,7 @@ void do_unittests()`
`422`	`422`	`import dmd.hdrgen;`
`423`	`423`	`auto buf = OutBuffer();`
`424`	`424`	`buf.doindent = 1;`
`425`		`- moduleToBuffer(buf, mod);`
	`425`	`+ moduleToBuffer(buf, false, mod);`
`426`	`426`
`427`	`427`	`OutputDebugStringA(buf.peekChars);`
`428`	`428`	`}`