Skip to content

Commit ef7ea3e

Browse files
authored
Update Code to 1.120.0 (#7796)
1 parent 190b09c commit ef7ea3e

6 files changed

Lines changed: 8 additions & 8 deletions

File tree

lib/vscode

Submodule vscode updated 1242 files

patches/clipboard.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/argv.ts
7878
===================================================================
7979
--- code-server.orig/lib/vscode/src/vs/platform/environment/common/argv.ts
8080
+++ code-server/lib/vscode/src/vs/platform/environment/common/argv.ts
81-
@@ -149,6 +149,7 @@ export interface NativeParsedArgs {
81+
@@ -148,6 +148,7 @@ export interface NativeParsedArgs {
8282
'disable-chromium-sandbox'?: boolean;
8383
sandbox?: boolean;
8484
'enable-coi'?: boolean;

patches/copilot.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Index: code-server/lib/vscode/build/lib/extensions.ts
4444
import vzip from 'gulp-vinyl-zip';
4545

4646
import { createRequire } from 'module';
47-
@@ -487,6 +488,116 @@ export function packageCopilotExtensionS
47+
@@ -492,6 +493,116 @@ export function packageCopilotExtensionS
4848
).pipe(util2.setExecutableBit(['**/*.sh']));
4949
}
5050

patches/display-language.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/environmentServ
3232
===================================================================
3333
--- code-server.orig/lib/vscode/src/vs/platform/environment/common/environmentService.ts
3434
+++ code-server/lib/vscode/src/vs/platform/environment/common/environmentService.ts
35-
@@ -112,7 +112,7 @@ export abstract class AbstractNativeEnvi
35+
@@ -98,7 +98,7 @@ export abstract class AbstractNativeEnvi
3636
return URI.file(join(vscodePortable, 'argv.json'));
3737
}
3838

patches/external-file-actions.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
207207
===================================================================
208208
--- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts
209209
+++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
210-
@@ -41,6 +41,9 @@ export const EmbedderIdentifierContext =
210+
@@ -40,6 +40,9 @@ export const EmbedderIdentifierContext =
211211

212212
export const InAutomationContext = new RawContextKey<boolean>('inAutomation', false, localize('inAutomation', "Whether VS Code is running under automation/smoke test"));
213213

patches/getting-started.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
2828
import { IEditorOpenContext, IEditorSerializer } from '../../../common/editor.js';
2929
import { IWebviewElement, IWebviewService } from '../../webview/browser/webview.js';
3030
import './gettingStartedColors.js';
31-
@@ -925,6 +925,72 @@ export class GettingStartedPage extends
31+
@@ -927,6 +927,72 @@ export class GettingStartedPage extends
3232
$('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved"))
3333
);
3434

@@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
101101
const leftColumn = $('.categories-column.categories-column-left', {},);
102102
const rightColumn = $('.categories-column.categories-column-right', {},);
103103

104-
@@ -974,6 +1040,9 @@ export class GettingStartedPage extends
104+
@@ -976,6 +1042,9 @@ export class GettingStartedPage extends
105105
recentList.setLimit(5);
106106
reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
107107
}
@@ -234,7 +234,7 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
234234
===================================================================
235235
--- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts
236236
+++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
237-
@@ -43,6 +43,7 @@ export const InAutomationContext = new R
237+
@@ -42,6 +42,7 @@ export const InAutomationContext = new R
238238

239239
export const IsEnabledFileDownloads = new RawContextKey<boolean>('isEnabledFileDownloads', true, true);
240240
export const IsEnabledFileUploads = new RawContextKey<boolean>('isEnabledFileUploads', true, true);

0 commit comments

Comments
 (0)