Skip to content

Commit 9233f04

Browse files
authored
Update Code to 1.108.0 (#7629)
1 parent 8c077bf commit 9233f04

File tree

5 files changed

+17
-15
lines changed

5 files changed

+17
-15
lines changed

lib/vscode

Submodule vscode updated 1067 files

patches/display-language.diff

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
272272
===================================================================
273273
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
274274
+++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
275-
@@ -475,9 +475,6 @@ export class InstallAction extends Exten
275+
@@ -474,9 +474,6 @@ export class InstallAction extends Exten
276276
if (this.extension.isBuiltin) {
277277
return;
278278
}
@@ -282,7 +282,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
282282
if (this.extension.state !== ExtensionState.Uninstalled) {
283283
return;
284284
}
285-
@@ -782,7 +779,7 @@ export abstract class InstallInOtherServ
285+
@@ -781,7 +778,7 @@ export abstract class InstallInOtherServ
286286
}
287287

288288
if (isLanguagePackExtension(this.extension.local.manifest)) {
@@ -291,7 +291,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
291291
}
292292

293293
// Prefers to run on UI
294-
@@ -2073,17 +2070,6 @@ export class SetLanguageAction extends E
294+
@@ -2072,17 +2069,6 @@ export class SetLanguageAction extends E
295295
update(): void {
296296
this.enabled = false;
297297
this.class = SetLanguageAction.DisabledClass;
@@ -309,15 +309,15 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
309309
}
310310

311311
override async run(): Promise<any> {
312-
@@ -2100,7 +2086,6 @@ export class ClearLanguageAction extends
312+
@@ -2099,7 +2085,6 @@ export class ClearLanguageAction extends
313313
private static readonly DisabledClass = `${this.EnabledClass} disabled`;
314314

315315
constructor(
316316
- @IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
317317
@ILocaleService private readonly localeService: ILocaleService,
318318
) {
319319
super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false);
320-
@@ -2110,17 +2095,6 @@ export class ClearLanguageAction extends
320+
@@ -2109,17 +2094,6 @@ export class ClearLanguageAction extends
321321
update(): void {
322322
this.enabled = false;
323323
this.class = ClearLanguageAction.DisabledClass;

patches/external-file-actions.diff

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,13 +239,14 @@ Index: code-server/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFi
239239
@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
240240
@IPathService protected readonly pathService: IPathService,
241241
@IKeybindingService private readonly keybindingService: IKeybindingService,
242-
@@ -311,20 +311,22 @@ export class SimpleFileDialog extends Di
242+
@@ -311,21 +311,23 @@ export class SimpleFileDialog extends Di
243243
this.filePickBox.placeholder = nls.localize('remoteFileDialog.placeholder', "Folder path");
244244
this.filePickBox.ok = true;
245245
this.filePickBox.okLabel = typeof this.options.openLabel === 'string' ? this.options.openLabel : this.options.openLabel?.withoutMnemonic;
246246
- if ((this.scheme !== Schemas.file) && this.options && this.options.availableFileSystems && (this.options.availableFileSystems.length > 1) && (this.options.availableFileSystems.indexOf(Schemas.file) > -1)) {
247247
- this.filePickBox.customButton = true;
248248
- this.filePickBox.customLabel = nls.localize('remoteFileDialog.local', 'Show Local');
249+
- this.filePickBox.customButtonSecondary = true;
249250
- let action;
250251
- if (isSave) {
251252
- action = SaveLocalFileCommand;
@@ -261,6 +262,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFi
261262
+ if ((this.scheme !== Schemas.file) && this.options && this.options.availableFileSystems && (this.options.availableFileSystems.length > 1) && (this.options.availableFileSystems.indexOf(Schemas.file) > -1)) {
262263
+ this.filePickBox.customButton = true;
263264
+ this.filePickBox.customLabel = nls.localize('remoteFileDialog.local', 'Show Local');
265+
+ this.filePickBox.customButtonSecondary = true;
264266
+ let action;
265267
+ if (isSave) {
266268
+ action = SaveLocalFileCommand;
@@ -288,7 +290,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo
288290
import { WorkbenchCompressibleAsyncDataTree } from '../../../../../platform/list/browser/listService.js';
289291
import { ISearchService, QueryType, getExcludes, ISearchConfiguration, ISearchComplete, IFileQuery } from '../../../../services/search/common/search.js';
290292
import { CancellationToken } from '../../../../../base/common/cancellation.js';
291-
@@ -1594,7 +1595,8 @@ export class FileDragAndDrop implements
293+
@@ -1597,7 +1598,8 @@ export class FileDragAndDrop implements
292294
@IConfigurationService private configurationService: IConfigurationService,
293295
@IInstantiationService private instantiationService: IInstantiationService,
294296
@IWorkspaceEditingService private workspaceEditingService: IWorkspaceEditingService,
@@ -298,7 +300,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo
298300
) {
299301
const updateDropEnablement = (e: IConfigurationChangeEvent | undefined) => {
300302
if (!e || e.affectsConfiguration('explorer.enableDragAndDrop')) {
301-
@@ -1819,15 +1821,17 @@ export class FileDragAndDrop implements
303+
@@ -1822,15 +1824,17 @@ export class FileDragAndDrop implements
302304

303305
// External file DND (Import/Upload file)
304306
if (data instanceof NativeDragAndDropData) {

patches/getting-started.diff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
1717
-import { $, Dimension, addDisposableListener, append, clearNode, reset } from '../../../../base/browser/dom.js';
1818
+import { $, Dimension, addDisposableListener, append, clearNode, reset, prepend } from '../../../../base/browser/dom.js';
1919
import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
20+
import { status } from '../../../../base/browser/ui/aria/aria.js';
2021
import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
21-
import { Button } from '../../../../base/browser/ui/button/button.js';
22-
@@ -53,7 +53,7 @@ import { IRecentFolder, IRecentWorkspace
22+
@@ -54,7 +54,7 @@ import { IRecentFolder, IRecentWorkspace
2323
import { OpenRecentAction } from '../../../browser/actions/windowActions.js';
2424
import { OpenFileFolderAction, OpenFolderAction, OpenFolderViaWorkspaceAction } from '../../../browser/actions/workspaceActions.js';
2525
import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
@@ -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-
@@ -916,6 +916,72 @@ export class GettingStartedPage extends
31+
@@ -920,6 +920,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-
@@ -951,6 +1017,9 @@ export class GettingStartedPage extends
104+
@@ -955,6 +1021,9 @@ export class GettingStartedPage extends
105105
recentList.setLimit(5);
106106
reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
107107
}

patches/integration.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Index: code-server/lib/vscode/src/vs/server/node/server.main.ts
4848
-[REMOTE_DATA_FOLDER, args['extensions-dir'], USER_DATA_PATH, APP_SETTINGS_HOME, MACHINE_SETTINGS_HOME, GLOBAL_STORAGE_HOME, LOCAL_HISTORY_HOME].forEach(f => {
4949
- try {
5050
- if (!fs.existsSync(f)) {
51-
- fs.mkdirSync(f, { mode: 0o700 });
51+
- fs.mkdirSync(f, { mode: 0o700, recursive: true });
5252
- }
5353
- } catch (err) { console.error(err); }
5454
-});
@@ -68,7 +68,7 @@ Index: code-server/lib/vscode/src/vs/server/node/server.main.ts
6868
+ [REMOTE_DATA_FOLDER, args['extensions-dir'], USER_DATA_PATH, APP_SETTINGS_HOME, MACHINE_SETTINGS_HOME, GLOBAL_STORAGE_HOME, LOCAL_HISTORY_HOME].forEach(f => {
6969
+ try {
7070
+ if (!fs.existsSync(f)) {
71-
+ fs.mkdirSync(f, { mode: 0o700 });
71+
+ fs.mkdirSync(f, { mode: 0o700, recursive: true });
7272
+ }
7373
+ } catch (err) { console.error(err); }
7474
+ });

0 commit comments

Comments
 (0)