microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-10 15:40:41 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

Merge branch 'main' into tyriar/193384__190288

Browse Source
This commit is contained in:
Daniel Imms
2023-12-08 12:19:41 -08:00
committed by GitHub
parent da0af68737 d3bedefd42
commit 3ffbd773b1
6 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts
View File

@@ -245,7 +245,7 @@ class ProcessExplorer {
this.setEventHandlers(data);
ipcRenderer.on('vscode:pidToNameResponse', (event: unknown, pidToNames: [number, string][]) => {
this.mapPidToName = new Map<number, string>();
this.mapPidToName.clear();
for (const [pid, name] of pidToNames) {
this.mapPidToName.set(pid, name);

2
src/vs/editor/common/model/tokenizationTextModelPart.ts
View File

@@ -463,7 +463,7 @@ class GrammarTokens extends Disposable {
if (tokenizationSupport && tokenizationSupport.createBackgroundTokenizer && !tokenizationSupport.backgroundTokenizerShouldOnlyVerifyTokens) {
this._backgroundTokenizer.value = tokenizationSupport.createBackgroundTokenizer(this._textModel, b);
}
if (!this._backgroundTokenizer.value) {
if (!this._backgroundTokenizer.value && !this._textModel.isTooLargeForTokenization()) {
this._backgroundTokenizer.value = this._defaultBackgroundTokenizer =
new DefaultBackgroundTokenizer(this._tokenizer, b);
this._defaultBackgroundTokenizer.handleChanges();

8
src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.ts
View File

@@ -287,6 +287,10 @@ class ActionViewItemWithClassName extends ActionViewItem {
container.classList.add(this._className);
}
}
protected override updateTooltip(): void {
// NOOP, disable tooltip
}
}
class StatusBarViewItem extends MenuEntryActionViewItem {
@@ -305,6 +309,10 @@ class StatusBarViewItem extends MenuEntryActionViewItem {
this.label.classList.add('inlineSuggestionStatusBarItemLabel');
}
}
protected override updateTooltip(): void {
// NOOP, disable tooltip
}
}
export class CustomizedMenuWorkbenchToolBar extends WorkbenchToolBar {

2
src/vs/workbench/contrib/debug/browser/debugToolBar.ts
View File

@@ -145,7 +145,7 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
this._register(this.actionBar.actionRunner.onDidRun((e: IRunEvent) => {
// check for error
if (e.error && !errors.isCancellationError(e.error)) {
this.notificationService.error(e.error);
this.notificationService.warn(e.error);
}
// log in telemetry

3
src/vs/workbench/contrib/files/browser/explorerService.ts
View File

@@ -286,6 +286,9 @@ export class ExplorerService implements IExplorerService {
const previouslyCutItems = this.cutItems;
this.cutItems = cut ? items : undefined;
await this.clipboardService.writeResources(items.map(s => s.resource));
if (items.length === 1) {
await this.clipboardService.writeText(items[0].name);
}
this.view?.itemsCopied(items, cut, previouslyCutItems);
}

6
src/vs/workbench/contrib/files/browser/fileActions.ts
View File

@@ -1124,6 +1124,12 @@ export const pasteFileHandler = async (accessor: ServicesAccessor, fileList?: Fi
const element = context.length ? context[0] : explorerService.roots[0];
const incrementalNaming = configurationService.getValue<IFilesConfiguration>().explorer.incrementalNaming;
const editableItem = explorerService.getEditable();
// If it's an editable item, just do nothing
if (editableItem) {
return;
}
try {
// Check if target is ancestor of pasted folder
const sourceTargetPairs = coalesce(await Promise.all(toPaste.map(async fileToPaste => {