Skip to content

Commit 5d92626

Browse files
TyriarTyriar
authored
Merge branch 'main' into tyriar/204965
2 parents b127f77 + 23860e9 commit 5d92626

File tree

19 files changed

+112
-75
lines changed

19 files changed

+112
-75
lines changed

‎build/lib/stylelint/vscode-known-variables.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
"--vscode-activityBar-inactiveForeground",
1212
"--vscode-activityBarBadge-background",
1313
"--vscode-activityBarBadge-foreground",
14+
"--vscode-activityBarTop-activeBackground",
1415
"--vscode-activityBarTop-activeBorder",
16+
"--vscode-activityBarTop-background",
1517
"--vscode-activityBarTop-dropBorder",
1618
"--vscode-activityBarTop-foreground",
1719
"--vscode-activityBarTop-inactiveForeground",
18-
"--vscode-activityBarTop-background",
19-
"--vscode-activityBarTop-activeBackground",
2020
"--vscode-badge-background",
2121
"--vscode-badge-foreground",
2222
"--vscode-banner-background",
@@ -261,6 +261,10 @@
261261
"--vscode-editorMarkerNavigationInfo-headerBackground",
262262
"--vscode-editorMarkerNavigationWarning-background",
263263
"--vscode-editorMarkerNavigationWarning-headerBackground",
264+
"--vscode-editorMultiCursor-primary-background",
265+
"--vscode-editorMultiCursor-primary-foreground",
266+
"--vscode-editorMultiCursor-secondary-background",
267+
"--vscode-editorMultiCursor-secondary-foreground",
264268
"--vscode-editorOverviewRuler-addedForeground",
265269
"--vscode-editorOverviewRuler-background",
266270
"--vscode-editorOverviewRuler-border",
@@ -557,11 +561,11 @@
557561
"--vscode-sideBar-border",
558562
"--vscode-sideBar-dropBackground",
559563
"--vscode-sideBar-foreground",
564+
"--vscode-sideBarActivityBarTop-border",
560565
"--vscode-sideBarSectionHeader-background",
561566
"--vscode-sideBarSectionHeader-border",
562567
"--vscode-sideBarSectionHeader-foreground",
563568
"--vscode-sideBarTitle-foreground",
564-
"--vscode-sideBarActivityBarTop-border",
565569
"--vscode-sideBySideEditor-horizontalBorder",
566570
"--vscode-sideBySideEditor-verticalBorder",
567571
"--vscode-simpleFindWidget-sashBorder",
@@ -702,11 +706,17 @@
702706
"--vscode-testing-coveredBorder",
703707
"--vscode-testing-coveredGutterBackground",
704708
"--vscode-testing-iconErrored",
709+
"--vscode-testing-iconErrored-retired",
705710
"--vscode-testing-iconFailed",
711+
"--vscode-testing-iconFailed-retired",
706712
"--vscode-testing-iconPassed",
713+
"--vscode-testing-iconPassed-retired",
707714
"--vscode-testing-iconQueued",
715+
"--vscode-testing-iconQueued-retired",
708716
"--vscode-testing-iconSkipped",
717+
"--vscode-testing-iconSkipped-retired",
709718
"--vscode-testing-iconUnset",
719+
"--vscode-testing-iconUnset-retired",
710720
"--vscode-testing-message-error-decorationForeground",
711721
"--vscode-testing-message-error-lineBackground",
712722
"--vscode-testing-message-info-decorationForeground",
@@ -720,7 +730,6 @@
720730
"--vscode-testing-uncoveredBorder",
721731
"--vscode-testing-uncoveredBranchBackground",
722732
"--vscode-testing-uncoveredGutterBackground",
723-
"--vscode-testing-uncoveredGutterBackground",
724733
"--vscode-textBlockQuote-background",
725734
"--vscode-textBlockQuote-border",
726735
"--vscode-textCodeBlock-background",

‎extensions/typescript-language-features/src/extension.browser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ async function startPreloadWorkspaceContentsIfNeeded(context: vscode.ExtensionCo
118118
return;
119119
}
120120

121-
const workspaceUri = vscode.workspace.workspaceFolders?.[0].uri;
121+
const workspaceUri = vscode.workspace.workspaceFolders?.at(0)?.uri;
122122
if (!workspaceUri || workspaceUri.scheme !== 'vscode-vfs' || !workspaceUri.authority.startsWith('github')) {
123123
logger.info(`Skipped loading workspace contents for repository ${workspaceUri?.toString()}`);
124124
return;

‎src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,9 @@ export class PostEditWidgetManager<T extends DocumentPasteEdit | DocumentOnDropE
164164
}
165165

166166
const resolvedEdit = await resolve(edit, token);
167+
if (token.isCancellationRequested) {
168+
return;
169+
}
167170

168171
const combinedWorkspaceEdit = createCombinedWorkspaceEdit(model.uri, ranges, resolvedEdit);
169172

@@ -174,6 +177,7 @@ export class PostEditWidgetManager<T extends DocumentPasteEdit | DocumentOnDropE
174177
options: { description: 'paste-line-suffix', stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges }
175178
}]);
176179

180+
this._editor.focus();
177181
let editResult: IBulkEditResult;
178182
let editRange: Range | null;
179183
try {
@@ -183,6 +187,10 @@ export class PostEditWidgetManager<T extends DocumentPasteEdit | DocumentOnDropE
183187
model.deltaDecorations(editTrackingDecoration, []);
184188
}
185189

190+
if (token.isCancellationRequested) {
191+
return;
192+
}
193+
186194
if (canShowWidget && editResult.isApplied && edits.allEdits.length > 1) {
187195
this.show(editRange ?? primaryRange, edits, async (newEditIndex) => {
188196
const model = this._editor.getModel();

‎src/vs/editor/contrib/snippet/browser/snippetController2.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ registerEditorCommand(new CommandCtor({
331331
handler: ctrl => ctrl.next(),
332332
kbOpts: {
333333
weight: KeybindingWeight.EditorContrib + 30,
334-
kbExpr: EditorContextKeys.editorTextFocus,
334+
kbExpr: EditorContextKeys.textInputFocus,
335335
primary: KeyCode.Tab
336336
}
337337
}));
@@ -341,7 +341,7 @@ registerEditorCommand(new CommandCtor({
341341
handler: ctrl => ctrl.prev(),
342342
kbOpts: {
343343
weight: KeybindingWeight.EditorContrib + 30,
344-
kbExpr: EditorContextKeys.editorTextFocus,
344+
kbExpr: EditorContextKeys.textInputFocus,
345345
primary: KeyMod.Shift | KeyCode.Tab
346346
}
347347
}));
@@ -351,7 +351,7 @@ registerEditorCommand(new CommandCtor({
351351
handler: ctrl => ctrl.cancel(true),
352352
kbOpts: {
353353
weight: KeybindingWeight.EditorContrib + 30,
354-
kbExpr: EditorContextKeys.editorTextFocus,
354+
kbExpr: EditorContextKeys.textInputFocus,
355355
primary: KeyCode.Escape,
356356
secondary: [KeyMod.Shift | KeyCode.Escape]
357357
}

‎src/vs/platform/telemetry/common/telemetryUtils.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ function removePropertiesWithPossibleUserInfo(property: string): string {
333333
{ label: 'Slack Token', regex: /xox[pbar]\-[A-Za-z0-9]/ },
334334
{ label: 'GitHub Token', regex: /(gh[psuro]_[a-zA-Z0-9]{36}|github_pat_[a-zA-Z0-9]{22}_[a-zA-Z0-9]{59})/ },
335335
{ label: 'Generic Secret', regex: /(key|token|sig|secret|signature|password|passwd|pwd|android:value)[^a-zA-Z0-9]/i },
336+
{ label: 'CLI Credentials', regex: /((login|psexec|(certutil|psexec)\.exe).{1,50}(\s-u(ser(name)?)?\s+.{3,100})?\s-(admin|user|vm|root)?p(ass(word)?)?\s+["']?[^$\-\/\s]|(^|[\s\r\n\\])net(\.exe)?.{1,5}(user\s+|share\s+\/user:| user -? secrets ? set) \s + [^ $\s \/])/ },
336337
{ label: 'Email', regex: /@[a-zA-Z0-9-]+\.[a-zA-Z0-9-]+/ } // Regex which matches @*.site
337338
];
338339

‎src/vs/workbench/api/browser/mainThreadBulkEdits.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity'
1212
import { IWorkspaceEditDto, IWorkspaceFileEditDto, MainContext, MainThreadBulkEditsShape } from 'vs/workbench/api/common/extHost.protocol';
1313
import { ResourceNotebookCellEdit } from 'vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
1414
import { IExtHostContext, extHostNamedCustomer } from 'vs/workbench/services/extensions/common/extHostCustomers';
15+
import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
1516

1617

1718
@extHostNamedCustomer(MainContext.MainThreadBulkEdits)
@@ -26,8 +27,8 @@ export class MainThreadBulkEdits implements MainThreadBulkEditsShape {
2627

2728
dispose(): void { }
2829

29-
$tryApplyWorkspaceEdit(dto: IWorkspaceEditDto, undoRedoGroupId?: number, isRefactoring?: boolean): Promise<boolean> {
30-
const edits = reviveWorkspaceEditDto(dto, this._uriIdentService);
30+
$tryApplyWorkspaceEdit(dto: SerializableObjectWithBuffers<IWorkspaceEditDto>, undoRedoGroupId?: number, isRefactoring?: boolean): Promise<boolean> {
31+
const edits = reviveWorkspaceEditDto(dto.value, this._uriIdentService);
3132
return this._bulkEditService.apply(edits, { undoRedoGroupId, respectAutoSaveConfig: isRefactoring }).then((res) => res.isApplied, err => {
3233
this._logService.warn(`IGNORING workspace edit: ${err}`);
3334
return false;

‎src/vs/workbench/api/common/extHost.protocol.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ export interface ITextDocumentShowOptions {
262262
}
263263

264264
export interface MainThreadBulkEditsShape extends IDisposable {
265-
$tryApplyWorkspaceEdit(workspaceEditDto: IWorkspaceEditDto, undoRedoGroupId?: number, respectAutoSaveConfig?: boolean): Promise<boolean>;
265+
$tryApplyWorkspaceEdit(workspaceEditDto: SerializableObjectWithBuffers<IWorkspaceEditDto>, undoRedoGroupId?: number, respectAutoSaveConfig?: boolean): Promise<boolean>;
266266
}
267267

268268
export interface MainThreadTextEditorsShape extends IDisposable {

‎src/vs/workbench/api/common/extHostBulkEdits.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { MainContext, MainThreadBulkEditsShape } from 'vs/workbench/api/common/e
88
import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
99
import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
1010
import { WorkspaceEdit } from 'vs/workbench/api/common/extHostTypeConverters';
11+
import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
1112
import type * as vscode from 'vscode';
1213

1314
export class ExtHostBulkEdits {
@@ -28,7 +29,7 @@ export class ExtHostBulkEdits {
2829
}
2930

3031
applyWorkspaceEdit(edit: vscode.WorkspaceEdit, extension: IExtensionDescription, metadata: vscode.WorkspaceEditMetadata | undefined): Promise<boolean> {
31-
const dto = WorkspaceEdit.from(edit, this._versionInformationProvider);
32+
const dto = new SerializableObjectWithBuffers(WorkspaceEdit.from(edit, this._versionInformationProvider));
3233
return this._proxy.$tryApplyWorkspaceEdit(dto, undefined, metadata?.isRefactoring ?? false);
3334
}
3435
}

‎src/vs/workbench/api/common/extHostDocumentSaveParticipant.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import type * as vscode from 'vscode';
1515
import { LinkedList } from 'vs/base/common/linkedList';
1616
import { ILogService } from 'vs/platform/log/common/log';
1717
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
18+
import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
1819

1920
type Listener = [Function, any, IExtensionDescription];
2021

@@ -165,7 +166,7 @@ export class ExtHostDocumentSaveParticipant implements ExtHostDocumentSavePartic
165166
}
166167

167168
if (version === document.version) {
168-
return this._mainThreadBulkEdits.$tryApplyWorkspaceEdit(dto);
169+
return this._mainThreadBulkEdits.$tryApplyWorkspaceEdit(new SerializableObjectWithBuffers(dto));
169170
}
170171

171172
return Promise.reject(new Error('concurrent_edits'));

‎src/vs/workbench/api/common/extHostNotebookDocumentSaveParticipant.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { ExtHostNotebookController } from 'vs/workbench/api/common/extHostNotebo
1313
import { TextDocumentSaveReason, WorkspaceEdit as WorksapceEditConverter } from 'vs/workbench/api/common/extHostTypeConverters';
1414
import { WorkspaceEdit } from 'vs/workbench/api/common/extHostTypes';
1515
import { SaveReason } from 'vs/workbench/common/editor';
16+
import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
1617
import { NotebookDocumentWillSaveEvent } from 'vscode';
1718

1819
interface IExtensionListener<E> {
@@ -90,6 +91,6 @@ export class ExtHostNotebookDocumentSaveParticipant implements ExtHostNotebookDo
9091
dto.edits = dto.edits.concat(edits);
9192
}
9293

93-
return this._mainThreadBulkEdits.$tryApplyWorkspaceEdit(dto);
94+
return this._mainThreadBulkEdits.$tryApplyWorkspaceEdit(new SerializableObjectWithBuffers(dto));
9495
}
9596
}

0 commit comments

Comments
 (0)