Merge pull request #43 from OpenCortexIDE/fix/streaming-freeze-local-providers

Fix/streaming freeze local providers

Author: Pterjudin

extensions/theme-defaults/package.json

@@ -60,6 +60,12 @@
         "label": "%lightHcColorThemeLabel%",
         "uiTheme": "hc-light",
         "path": "./themes/hc_light.json"
+      },
+      {
+        "id": "CortexIDE Dark",
+        "label": "%cortexideDarkColorThemeLabel%",
+        "uiTheme": "vs-dark",
+        "path": "./themes/cortexide_dark.json"
       }
     ],
     "iconThemes": [

extensions/theme-defaults/package.nls.json

@@ -9,5 +9,6 @@
 	"lightColorThemeLabel": "Light (Visual Studio)",
 	"hcColorThemeLabel": "Dark High Contrast",
 	"lightHcColorThemeLabel": "Light High Contrast",
+	"cortexideDarkColorThemeLabel": "CortexIDE Dark",
 	"minimalIconThemeLabel": "Minimal (Visual Studio Code)"
 }

extensions/theme-defaults/themes/cortexide_dark.json

@@ -0,0 +1,38 @@
+{
+	"$schema": "vscode://schemas/color-theme",
+	"name": "CortexIDE Dark",
+	"include": "./dark_vs.json",
+	"colors": {
+		"editor.background": "#010101",
+		"editor.foreground": "#e2e3f0",
+		"sideBar.background": "#040404",
+		"sideBar.foreground": "#e2e3f0",
+		"sideBarTitle.foreground": "#a5a7c4",
+		"input.background": "#080808",
+		"input.foreground": "#e2e3f0",
+		"input.placeholderForeground": "#6d708d",
+		"input.border": "#1f1f1f",
+		"focusBorder": "#7b5cff",
+		"checkbox.border": "#1f1f1f",
+		"editor.inactiveSelectionBackground": "#0d0d0d",
+		"editorIndentGuide.background1": "#161616",
+		"editorIndentGuide.activeBackground1": "#1f1f1f",
+		"editor.selectionHighlightBackground": "#7b5cff26",
+		"list.dropBackground": "#101010",
+		"activityBarBadge.background": "#7b5cff",
+		"menu.background": "#080808",
+		"menu.foreground": "#e2e3f0",
+		"menu.separatorBackground": "#1f1f1f",
+		"menu.border": "#1f1f1f",
+		"menu.selectionBackground": "#101010",
+		"sideBarSectionHeader.background": "#0000",
+		"sideBarSectionHeader.border": "#1f1f1f",
+		"tab.selectedBackground": "#080808",
+		"tab.selectedForeground": "#e2e3f0",
+		"tab.lastPinnedBorder": "#1f1f1f",
+		"list.activeSelectionIconForeground": "#e2e3f0",
+		"terminal.inactiveSelectionBackground": "#0d0d0d",
+		"widget.border": "#1f1f1f",
+		"actionBar.toggledBackground": "#101010"
+	}
+}

product.json

@@ -1,7 +1,7 @@
 {
 	"nameShort": "CortexIDE",
 	"nameLong": "CortexIDE",
-	"cortexVersion": "0.0.9",
+	"cortexVersion": "0.0.10",
 	"cortexRelease": "0001",
 	"applicationName": "cortexide",
 	"dataFolderName": ".cortexide",

src/vs/platform/update/electron-main/updateService.win32.ts

@@ -227,7 +227,8 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 		this.availableUpdate.updateFilePath = path.join(cachePath, `CodeSetup-${this.productService.quality}-${update.version}.flag`);
 
 		await pfs.Promises.writeFile(this.availableUpdate.updateFilePath, 'flag');
-		const child = spawn(this.availableUpdate.packagePath, ['/verysilent', '/log', `/update="${this.availableUpdate.updateFilePath}"`, '/nocloseapplications', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
+		// Do not pass /mergetasks so the installer preserves the user's previous task choices (desktop icon, quick launch, etc.) from the registry instead of forcing our own.
+		const child = spawn(this.availableUpdate.packagePath, ['/verysilent', '/log', `/update="${this.availableUpdate.updateFilePath}"`, '/nocloseapplications'], {
 			detached: true,
 			stdio: ['ignore', 'ignore', 'ignore'],
 			windowsVerbatimArguments: true
@@ -256,7 +257,8 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 		if (this.availableUpdate.updateFilePath) {
 			fs.unlinkSync(this.availableUpdate.updateFilePath);
 		} else {
-			spawn(this.availableUpdate.packagePath, ['/silent', '/log', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
+			// Do not pass /mergetasks so the installer preserves the user's previous task choices (desktop icon, quick launch, etc.).
+			spawn(this.availableUpdate.packagePath, ['/silent', '/log'], {
 				detached: true,
 				stdio: ['ignore', 'ignore', 'ignore']
 			});