Skip to content

Commit 079043b

Browse files
authored
Merge pull request #43 from OpenCortexIDE/fix/streaming-freeze-local-providers
Fix/streaming freeze local providers
2 parents 980a4bc + fb86cd5 commit 079043b

9 files changed

Lines changed: 161 additions & 243 deletions

File tree

extensions/theme-defaults/package.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@
6060
"label": "%lightHcColorThemeLabel%",
6161
"uiTheme": "hc-light",
6262
"path": "./themes/hc_light.json"
63+
},
64+
{
65+
"id": "CortexIDE Dark",
66+
"label": "%cortexideDarkColorThemeLabel%",
67+
"uiTheme": "vs-dark",
68+
"path": "./themes/cortexide_dark.json"
6369
}
6470
],
6571
"iconThemes": [

extensions/theme-defaults/package.nls.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@
99
"lightColorThemeLabel": "Light (Visual Studio)",
1010
"hcColorThemeLabel": "Dark High Contrast",
1111
"lightHcColorThemeLabel": "Light High Contrast",
12+
"cortexideDarkColorThemeLabel": "CortexIDE Dark",
1213
"minimalIconThemeLabel": "Minimal (Visual Studio Code)"
1314
}
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"$schema": "vscode://schemas/color-theme",
3+
"name": "CortexIDE Dark",
4+
"include": "./dark_vs.json",
5+
"colors": {
6+
"editor.background": "#010101",
7+
"editor.foreground": "#e2e3f0",
8+
"sideBar.background": "#040404",
9+
"sideBar.foreground": "#e2e3f0",
10+
"sideBarTitle.foreground": "#a5a7c4",
11+
"input.background": "#080808",
12+
"input.foreground": "#e2e3f0",
13+
"input.placeholderForeground": "#6d708d",
14+
"input.border": "#1f1f1f",
15+
"focusBorder": "#7b5cff",
16+
"checkbox.border": "#1f1f1f",
17+
"editor.inactiveSelectionBackground": "#0d0d0d",
18+
"editorIndentGuide.background1": "#161616",
19+
"editorIndentGuide.activeBackground1": "#1f1f1f",
20+
"editor.selectionHighlightBackground": "#7b5cff26",
21+
"list.dropBackground": "#101010",
22+
"activityBarBadge.background": "#7b5cff",
23+
"menu.background": "#080808",
24+
"menu.foreground": "#e2e3f0",
25+
"menu.separatorBackground": "#1f1f1f",
26+
"menu.border": "#1f1f1f",
27+
"menu.selectionBackground": "#101010",
28+
"sideBarSectionHeader.background": "#0000",
29+
"sideBarSectionHeader.border": "#1f1f1f",
30+
"tab.selectedBackground": "#080808",
31+
"tab.selectedForeground": "#e2e3f0",
32+
"tab.lastPinnedBorder": "#1f1f1f",
33+
"list.activeSelectionIconForeground": "#e2e3f0",
34+
"terminal.inactiveSelectionBackground": "#0d0d0d",
35+
"widget.border": "#1f1f1f",
36+
"actionBar.toggledBackground": "#101010"
37+
}
38+
}

product.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"nameShort": "CortexIDE",
33
"nameLong": "CortexIDE",
4-
"cortexVersion": "0.0.9",
4+
"cortexVersion": "0.0.10",
55
"cortexRelease": "0001",
66
"applicationName": "cortexide",
77
"dataFolderName": ".cortexide",

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,8 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
227227
this.availableUpdate.updateFilePath = path.join(cachePath, `CodeSetup-${this.productService.quality}-${update.version}.flag`);
228228

229229
await pfs.Promises.writeFile(this.availableUpdate.updateFilePath, 'flag');
230-
const child = spawn(this.availableUpdate.packagePath, ['/verysilent', '/log', `/update="${this.availableUpdate.updateFilePath}"`, '/nocloseapplications', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
230+
// 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.
231+
const child = spawn(this.availableUpdate.packagePath, ['/verysilent', '/log', `/update="${this.availableUpdate.updateFilePath}"`, '/nocloseapplications'], {
231232
detached: true,
232233
stdio: ['ignore', 'ignore', 'ignore'],
233234
windowsVerbatimArguments: true
@@ -256,7 +257,8 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
256257
if (this.availableUpdate.updateFilePath) {
257258
fs.unlinkSync(this.availableUpdate.updateFilePath);
258259
} else {
259-
spawn(this.availableUpdate.packagePath, ['/silent', '/log', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
260+
// Do not pass /mergetasks so the installer preserves the user's previous task choices (desktop icon, quick launch, etc.).
261+
spawn(this.availableUpdate.packagePath, ['/silent', '/log'], {
260262
detached: true,
261263
stdio: ['ignore', 'ignore', 'ignore']
262264
});

0 commit comments

Comments
 (0)