From 230c2b5452e9f36bbf5a70af8a089638a962dc92 Mon Sep 17 00:00:00 2001 From: Colin Snover Date: Mon, 20 Feb 2023 23:31:10 -0600 Subject: [PATCH 1/2] Deduplicate document language test --- Extension/src/LanguageServer/client.ts | 37 +++++++---------------- Extension/src/LanguageServer/extension.ts | 13 +++----- Extension/src/LanguageServer/ui.ts | 3 +- Extension/src/common.ts | 4 +++ 4 files changed, 21 insertions(+), 36 deletions(-) diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts index 5af0415604..a5e36566f4 100644 --- a/Extension/src/LanguageServer/client.ts +++ b/Extension/src/LanguageServer/client.ts @@ -1537,20 +1537,16 @@ export class DefaultClient implements Client { } public onDidChangeTextDocument(textDocumentChangeEvent: vscode.TextDocumentChangeEvent): void { - if (textDocumentChangeEvent.document.uri.scheme === "file") { - if (textDocumentChangeEvent.document.languageId === "c" - || textDocumentChangeEvent.document.languageId === "cpp" - || textDocumentChangeEvent.document.languageId === "cuda-cpp") { - // If any file has changed, we need to abort the current rename operation - if (DefaultClient.renamePending) { - this.cancelReferences(); - } + if (textDocumentChangeEvent.document.uri.scheme === "file" && util.isCppToolsFile(textDocumentChangeEvent.document)) { + // If any file has changed, we need to abort the current rename operation + if (DefaultClient.renamePending) { + this.cancelReferences(); + } - const oldVersion: number | undefined = openFileVersions.get(textDocumentChangeEvent.document.uri.toString()); - const newVersion: number = textDocumentChangeEvent.document.version; - if (oldVersion === undefined || newVersion > oldVersion) { - openFileVersions.set(textDocumentChangeEvent.document.uri.toString(), newVersion); - } + const oldVersion: number | undefined = openFileVersions.get(textDocumentChangeEvent.document.uri.toString()); + const newVersion: number = textDocumentChangeEvent.document.version; + if (oldVersion === undefined || newVersion > oldVersion) { + openFileVersions.set(textDocumentChangeEvent.document.uri.toString(), newVersion); } } } @@ -2533,10 +2529,7 @@ export class DefaultClient implements Client { private updateActiveDocumentTextOptions(): void { const editor: vscode.TextEditor | undefined = vscode.window.activeTextEditor; - if (editor?.document?.uri.scheme === "file" - && (editor.document.languageId === "c" - || editor.document.languageId === "cpp" - || editor.document.languageId === "cuda-cpp")) { + if (editor?.document?.uri.scheme === "file" && util.isCppToolsFile(editor.document)) { vscode.commands.executeCommand('setContext', 'BuildAndDebug.isSourceFile', util.isCppOrCFile(editor.document.uri)); vscode.commands.executeCommand('setContext', 'BuildAndDebug.isFolderOpen', util.isFolderOpen(editor.document.uri)); // If using vcFormat, check for a ".editorconfig" file, and apply those text options to the active document. @@ -3050,15 +3043,7 @@ export class DefaultClient implements Client { public async handleGenerateDoxygenComment(args: DoxygenCodeActionCommandArguments | vscode.Uri | undefined): Promise { const editor: vscode.TextEditor | undefined = vscode.window.activeTextEditor; - if (!editor) { - return; - } - - if (editor.document.uri.scheme !== "file") { - return; - } - - if (!(editor.document.languageId === "c" || editor.document.languageId === "cpp" || editor.document.languageId === "cuda-cpp")) { + if (editor?.document.uri.scheme !== "file" || !util.isCppToolsFile(editor.document)) { return; } diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts index 54590cbd20..2c890be2d8 100644 --- a/Extension/src/LanguageServer/extension.ts +++ b/Extension/src/LanguageServer/extension.ts @@ -297,7 +297,7 @@ export function onDidChangeActiveTextEditor(editor?: vscode.TextEditor): void { } const activeEditor: vscode.TextEditor | undefined = vscode.window.activeTextEditor; - if (!editor || !activeEditor || activeEditor.document.uri.scheme !== "file" || (activeEditor.document.languageId !== "c" && activeEditor.document.languageId !== "cpp" && activeEditor.document.languageId !== "cuda-cpp")) { + if (!editor || activeEditor?.document.uri.scheme !== "file" || !util.isCppToolsFile(activeEditor.document)) { activeDocument = ""; } else { activeDocument = editor.document.uri.toString(); @@ -354,7 +354,7 @@ export async function processDelayedDidOpen(document: vscode.TextDocument): Prom function onDidChangeVisibleTextEditors(editors: readonly vscode.TextEditor[]): void { // Process delayed didOpen for any visible editors we haven't seen before editors.forEach(async (editor) => { - if ((editor.document.uri.scheme === "file") && (editor.document.languageId === "c" || editor.document.languageId === "cpp" || editor.document.languageId === "cuda-cpp")) { + if (editor.document.uri.scheme === "file" && util.isCppToolsFile(editor.document)) { const client: Client = clients.getClientFor(editor.document.uri); await client.requestWhenReady(() => processDelayedDidOpen(editor.document)); client.onDidChangeVisibleTextEditor(editor); @@ -508,8 +508,7 @@ function onDisabledCommand(): void { function onRestartIntelliSenseForFile(): void { const activeEditor: vscode.TextEditor | undefined = vscode.window.activeTextEditor; - if (!activeEditor || !activeEditor.document || activeEditor.document.uri.scheme !== "file" || - (activeEditor.document.languageId !== "c" && activeEditor.document.languageId !== "cpp" && activeEditor.document.languageId !== "cuda-cpp")) { + if (activeEditor?.document.uri.scheme !== "file" || !util.isCppToolsFile(activeEditor.document)) { return; } clients.ActiveClient.restartIntelliSenseForFile(activeEditor.document); @@ -517,11 +516,7 @@ function onRestartIntelliSenseForFile(): void { async function onSwitchHeaderSource(): Promise { const activeEditor: vscode.TextEditor | undefined = vscode.window.activeTextEditor; - if (!activeEditor || !activeEditor.document) { - return; - } - - if (activeEditor.document.languageId !== "c" && activeEditor.document.languageId !== "cpp" && activeEditor.document.languageId !== "cuda-cpp") { + if (!activeEditor?.document || !util.isCppToolsFile(activeEditor?.document)) { return; } diff --git a/Extension/src/LanguageServer/ui.ts b/Extension/src/LanguageServer/ui.ts index 4e47556ee9..e32b5f0aa5 100644 --- a/Extension/src/LanguageServer/ui.ts +++ b/Extension/src/LanguageServer/ui.ts @@ -13,6 +13,7 @@ import { getCustomConfigProviders, CustomConfigurationProviderCollection, isSame import * as telemetry from '../telemetry'; import { IExperimentationService } from 'tas-client'; import { CppSettings } from './settings'; +import { isCppToolsFile } from '../common'; nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFormat.standalone })(); const localize: nls.LocalizeFunc = nls.loadMessageBundle(); @@ -283,7 +284,7 @@ export class OldUI implements UI { if (!activeEditor) { this.ShowConfiguration = false; } else { - const isCpp: boolean = (activeEditor.document.uri.scheme === "file" && (activeEditor.document.languageId === "c" || activeEditor.document.languageId === "cpp" || activeEditor.document.languageId === "cuda-cpp")); + const isCpp: boolean = (activeEditor.document.uri.scheme === "file" && isCppToolsFile(activeEditor.document)); let isCppPropertiesJson: boolean = false; if (activeEditor.document.languageId === "json" || activeEditor.document.languageId === "jsonc") { diff --git a/Extension/src/common.ts b/Extension/src/common.ts index 15fe67f7dc..049c90b983 100644 --- a/Extension/src/common.ts +++ b/Extension/src/common.ts @@ -180,6 +180,10 @@ export function isCppOrCFile(uri: vscode.Uri | undefined): boolean { return isCppFile(uri) || isCFile(uri); } +export function isCppToolsFile(document: vscode.TextDocument): boolean { + return [ "c", "cpp", "cuda-cpp" ].includes(document.languageId); +} + export function isFolderOpen(uri: vscode.Uri): boolean { const folder: vscode.WorkspaceFolder | undefined = vscode.workspace.getWorkspaceFolder(uri); return folder ? true : false; From 16161976163cc389d643a8f75f5d3328f5597070 Mon Sep 17 00:00:00 2001 From: Colin Snover Date: Mon, 20 Feb 2023 23:31:50 -0600 Subject: [PATCH 2/2] Add Assistant Editor Closes #10532. --- Extension/package.json | 5 + Extension/package.nls.json | 1 + .../src/LanguageServer/assistantEditor.ts | 463 ++++++++++++++++++ Extension/src/LanguageServer/extension.ts | 2 + Extension/src/main.ts | 3 + 5 files changed, 474 insertions(+) create mode 100644 Extension/src/LanguageServer/assistantEditor.ts diff --git a/Extension/package.json b/Extension/package.json index 0669d44ddf..d0bee67858 100644 --- a/Extension/package.json +++ b/Extension/package.json @@ -2924,6 +2924,11 @@ "title": "%c_cpp.command.switchHeaderSource.title%", "category": "C/C++" }, + { + "command": "C_Cpp.ToggleAssistantEditor", + "title": "%c_cpp.command.toggleAssistantEditor.title%", + "category": "C/C++" + }, { "command": "C_Cpp.EnableErrorSquiggles", "title": "%c_cpp.command.enableErrorSquiggles.title%", diff --git a/Extension/package.nls.json b/Extension/package.nls.json index 1a66800400..5b8f50fda5 100644 --- a/Extension/package.nls.json +++ b/Extension/package.nls.json @@ -13,6 +13,7 @@ "c_cpp.command.configurationEditUI.title": "Edit Configurations (UI)", "c_cpp.command.selectDefaultCompiler.title": "Select Default Compiler", "c_cpp.command.switchHeaderSource.title": "Switch Header/Source", + "c_cpp.command.toggleAssistantEditor.title": "Toggle Assistant Editor", "c_cpp.command.enableErrorSquiggles.title": "Enable Error Squiggles", "c_cpp.command.disableErrorSquiggles.title": "Disable Error Squiggles", "c_cpp.command.toggleIncludeFallback.title": "Toggle IntelliSense Engine Fallback on Include Errors", diff --git a/Extension/src/LanguageServer/assistantEditor.ts b/Extension/src/LanguageServer/assistantEditor.ts new file mode 100644 index 0000000000..e3a43c6e72 --- /dev/null +++ b/Extension/src/LanguageServer/assistantEditor.ts @@ -0,0 +1,463 @@ +// SPDX-License-Identifier: MIT + +import * as pathUtil from 'path'; +import * as vscode from 'vscode'; +import { PersistentWorkspaceState } from './persistentState'; +import * as nls from 'vscode-nls'; +import { isCppOrCFile, isCppToolsFile, isHeaderFile } from '../common'; + +/** + * Reattaches persisted Assistant Editors to the tabs where they were loaded + * before the window was closed. + */ +export function restoreAll() { + try { + for (const state of workspaceState.values()) { + console.log("restoring assistant with state", state); + instances.push(new AssistantEditor(state)); + } + } catch (error) { + console.error(error); + console.log("clearing persistent assistant data"); + workspaceState.clear(); + } +} + +/** + * Opens or closes an Assistant Editor for the currently active tab group. + */ +export async function toggle(): Promise { + const sourceViewColumn = vscode.window.tabGroups.activeTabGroup.viewColumn; + const editor = instances.find(editor => [ editor.tab?.group.viewColumn, editor.state.sourceViewColumn ].includes(sourceViewColumn)); + if (editor) { + // This causes the instance to remove itself from the persistent state + // list because users can close the Assistant Editor by closing its tab + // and the editor is already listening for these tab events + editor.dispose(); + } else { + const state = new PersistentState(); + state.sourceViewColumn = sourceViewColumn; + workspaceState.push(state); + instances.push(new AssistantEditor(state)); + } +} + +nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFormat.standalone })(); +const localize: nls.LocalizeFunc = nls.loadMessageBundle(); + +/** + * Active Assistant Editor instances. + */ +const instances: AssistantEditor[] = []; + +/** + * The Assistant Editor manages a tab which automatically changes to display the + * counterpart header or source of whatever file is loaded in the currently + * active text editor. + */ +class AssistantEditor implements vscode.Disposable { + /** + * The persistent workspace state of the Assistant Editor. + */ + readonly state: PersistentState; + + /** + * The {@link vscode.Uri} of the counterpart to the file displayed in the + * Assistant Editor. + */ + counterpart?: vscode.Uri; + + /** + * If true, the Assistant Editor found a valid counterpart file. + */ + hasCounterpart: boolean = false; + + /** + * If true, the Assistant Editor is waiting for a + * {@link vscode.TabChangeEvent} containing the new tab that it created for + * itself. + * + * This approach is used instead of searching the tab groups for the new tab + * because it is impossible to differentiate between two editors sharing a + * document with the same URI, so if an editor was already open for a + * counterpart file, it would be incorrectly adopted as the Assistant Editor + * tab. + * + * It would be better if VSCode would allow extensions to replace the + * content of a tab but this does not appear to be possible as of 1.75. + */ + inViewSwitch: boolean = false; + + /** + * Registered global event listeners. + */ + listeners: vscode.Disposable[] = []; + + /** + * The tab of the Assistant Editor. + */ + tab?: vscode.Tab; + + /** + * The index of the Assistant Editor tab group. This is required because Tab + * objects are invalidated and need to be re-fetched when tab groups change. + */ + tabGroupIndex: number = -1; + + /** + * The index of the Assistant Editor tab in its tab group. This is required + * because Tab objects are invalidated and need to be re-fetched when tab + * groups change. + */ + tabIndex: number = -1; + + /** + * The index of the source tab group. This is required because view columns + * are not stable for tab groups, but their indexes are. + */ + sourceGroupIndex: number = -1; + + constructor(state: PersistentState) { + this.state = state; + + const tabGroups = vscode.window.tabGroups; + tabGroups.onDidChangeTabGroups(this.updateTabGroups, this, this.listeners); + tabGroups.onDidChangeTabs(this.updateTabs, this, this.listeners); + + const sourcePredicate = (group: vscode.TabGroup) => group.viewColumn === state.sourceViewColumn; + const sourceTabGroup = tabGroups.all.find(sourcePredicate) || vscode.window.tabGroups.activeTabGroup; + this.sourceGroupIndex = tabGroups.all.indexOf(sourceTabGroup); + + const input = sourceTabGroup.activeTab?.input; + let uri: vscode.Uri; + if (input instanceof vscode.TabInputText) { + uri = input.uri; + } else { + uri = vscode.Uri.from({ scheme: "untitled" }); + } + + // If a restored Assistant Editor was attached to a text editor, VSCode + // itself will have serialised and restored the underlying text editor, + // and that needs to be adopted instead of replaced because it may have + // contained unsaved changes. + // Otherwise, this is either a brand new Assistant Editor, or the + // restored Assistant Editor was showing a “No counterpart” message that + // must be recreated because VSCode does not retain webview state + if (state.tabIndex !== PersistentState.NoTextEditor) { + const tabPredicate = (group: vscode.TabGroup) => group.viewColumn === state.viewColumn; + const tabGroupIndex = vscode.window.tabGroups.all.findIndex(tabPredicate); + const tab = vscode.window.tabGroups.all[tabGroupIndex]?.tabs[state.tabIndex]; + if (tab) { + this.tab = tab; + this.tabGroupIndex = tabGroupIndex; + this.tabIndex = state.tabIndex; + this.counterpart = uri; + } + } + + this.update(uri); + } + + /** + * Destroys the Assistant Editor. + */ + dispose() { + console.log("destroying assistant"); + workspaceState.remove(this.state); + instances.splice(instances.indexOf(this), 1); + this.listeners.forEach(d => d.dispose()); + if (this.tab) { + vscode.window.tabGroups.close(this.tab, !this.tab.isActive); + } + } + + /** + * Updates the Assistant Editor with a new counterpart file. + * + * @param uri The URI of the counterpart file. + * @returns A promise that resolves once the Assistant Editor is finished + * updating. + */ + async update(uri: vscode.Uri) { + if (this.counterpart?.toString() === uri.toString()) { + return; + } + + this.counterpart = uri; + + const options: vscode.TextDocumentShowOptions & VsCodeCreateWebviewPanelOptions = { + viewColumn: this.state.viewColumn, + preserveFocus: true + }; + const document = await loadDocument(uri); + this.inViewSwitch = true; + this.hasCounterpart = Boolean(document); + if (document) { + // The editor must never be a preview or else if a user focuses the + // Assistant Editor without making changes and tries to load a new + // document it would replace its content with the wrong content. + // Also, without extra work to check the preview flag, it would + // cause the old tab to be double-closed. + // Unfortunately, this will always push the Assistant Editor to the + // end of the tab group, because VSCode has no API for tab placement + // within a group, and the only API for moving is running a command + // that can only move the *active* editor. + options.preview = false; + await vscode.window.showTextDocument(document, options); + } else { + this.state.tabIndex = PersistentState.NoTextEditor; + workspaceState.commit(); + emptyEditor(options); + } + } + + /** + * Updates the Assistant Editor after any change to the tab layout. + */ + updateFromActiveTab() { + // *Any* change to other tabs (add, remove, or update) within the + // tab group where the Assistant Editor lives may cause the position + // of its tab to change, and any changes to the layout of the tabs may + // cause groups/view columns to change, and any changes to tab groups + // cause Tab instances to invalidate, so it is necessary to do this + // recovery garbage basically all the time + this.state.sourceViewColumn = vscode.window.tabGroups.all[this.sourceGroupIndex].viewColumn; + if (this.tab) { + this.state.viewColumn = this.tab.group.viewColumn; + this.tabGroupIndex = vscode.window.tabGroups.all.indexOf(this.tab.group); + this.tabIndex = this.tab.group.tabs.indexOf(this.tab); + if (this.hasCounterpart) { + this.state.tabIndex = this.tabIndex; + } + } + workspaceState.commit(); + + const activeTabGroup = vscode.window.tabGroups.activeTabGroup; + if (activeTabGroup.viewColumn === this.state.sourceViewColumn) { + const input = activeTabGroup.activeTab?.input; + if (input instanceof vscode.TabInputText) { + this.update(input.uri); + } + } + } + + /** + * Updates the Assistant Editor in response to relevant tab group changes. + */ + async updateTabGroups(event: vscode.TabGroupChangeEvent) { + if (event.closed.some(group => group.viewColumn === this.state.viewColumn)) { + this.tab = undefined; + this.dispose(); + } else if (event.closed.some(group => group.viewColumn === this.state.sourceViewColumn)) { + this.dispose(); + } else { + // VSCode invalidates Tab objects when a new group is opened + // (multiple times; a second event that says that all of the groups + // “changed” also invalidates everything again), so it is necessary + // to recover it by index every time there is a tab group event 😩 + if (this.tab) { + const group = vscode.window.tabGroups.all[this.tabGroupIndex]; + this.tab = group.tabs[this.tabIndex]; + + if (!this.tab) { + console.error("invalidated tab lost forever"); + this.dispose(); + return; + } + } + + // This has to be done in both tab group and tab update events + // because if a tab is made active by clicking on it, the tab active + // state is updated first and then the tab group active state is + // updated second, so the tab group being activated will not be seen + // as active at the time the tab change event occurs and the + // Assistant Editor will not update itself + this.updateFromActiveTab(); + } + } + + /** + * Updates the Assistant Editor in response to relevant tab changes. + */ + async updateTabs(event: vscode.TabChangeEvent) { + if (this.tab && event.closed.some(tab => tab === this.tab)) { + this.tab = undefined; + this.dispose(); + return; + } + + // VSCode will send multiple tab change events instead of coalescing + // them, so the one where a tab is opened is the one that should be a + // new Assistant Editor tab + if (this.inViewSwitch && event.opened.length === 1) { + const oldTab = this.tab; + this.tab = event.opened[0]; + this.inViewSwitch = false; + + // Close the tab only after the new one is shown to avoid the + // situation where the whole view column disappears for a frame if + // there are no other tabs in it. It sure would be better if the tab + // content could just be replaced, but there is no API for that as + // of 1.75. + // If the user cancels the save confirmation then we will just let + // the tab become a detached editor + // TODO: Maybe add a preference to auto-save the content of the + // Assistant Editor instead if it is dirty so this cannot happen? + if (oldTab) { + vscode.window.tabGroups.close(oldTab, false); + } + } + + this.updateFromActiveTab(); + } +} + +/** + * Anonymous options object extracted from the signature of + * {@link vscode.createWebviewPanel}. + */ +interface VsCodeCreateWebviewPanelOptions { + readonly viewColumn: vscode.ViewColumn; + readonly preserveFocus?: boolean; +} + +/** + * Creates an empty webview to display in the Assistant Editor when no + * counterpart file is found. + */ +function emptyEditor(options: VsCodeCreateWebviewPanelOptions) { + const panel = vscode.window.createWebviewPanel( + 'C_Cpp.AssistantEditor', + localize("assistant.editor.empty.tab.label", "Assistant"), + options + ); + panel.webview.html = ` + + ${localize("no.counterpart.found", "No counterpart found")}`; + return panel; +} + +/** + * Tries to find and load the counterpoint {@link vscode.TextDocument} + * for a given URI. + * + * @param uri The URI for which a counterpart should be loaded. + * @returns A promise that resolves to the counterpart document. + */ +async function loadDocument(uri: vscode.Uri) { + const document = await vscode.workspace.openTextDocument(uri); + if (isCppToolsFile(document)) { + const path = vscode.workspace.asRelativePath(uri); + const ext = pathUtil.extname(path); + + const candidates = await vscode.workspace.findFiles( + path.slice(0, path.length - ext.length) + '*', + path + ); + + const isCounterpart = isHeaderFile(uri) ? isCppOrCFile : isHeaderFile; + const targetFileName = candidates.find(isCounterpart)?.fsPath; + if (targetFileName) { + return vscode.workspace.openTextDocument(targetFileName); + } + } +} + +/** + * State information for an Assistant Editor that is persisted across reloads. + */ +class PersistentState { + /** + * Constant used when the Assistant Editor was not attached to any text + * editor. + * This should match the value returned by `Array#indexOf`. + */ + static readonly NoTextEditor = -1; + + /** + * The view column containing the main editors that the Assistant Editor is + * listening for. + */ + sourceViewColumn: vscode.ViewColumn = vscode.ViewColumn.Active; + + /** + * The view column containing the Assistant Editor. + */ + viewColumn: vscode.ViewColumn = vscode.ViewColumn.Beside; + + /** + * The index of the Assistant Editor tab within its tab group if it is + * attached to a text editor, or {@link PersistentState.NoTextEditor} if it + * is not. + */ + tabIndex: number = PersistentState.NoTextEditor; +} + +/** + * Persistent Assistant Editor data storage. + */ +const workspaceState = (function() { + /** + * @returns the backing store. + */ + const storage = (function () { + // This is lazy-loaded because the PersistentWorkspaceState must be + // constructed only after the workspace state is initialised + let storage: PersistentWorkspaceState | undefined; + + return function() { + if (!storage) { + storage = new PersistentWorkspaceState("CPP.assistantEditor", []); + } + return storage; + }; + })(); + + return { + /** + * Clears the backing store. This change is automatically committed. + */ + clear() { + storage().setDefault(); + }, + + /** + * Commits all state changes to the backing store. + */ + commit() { + storage().Value = storage().Value; + }, + + /** + * Adds a persistent state to the backing store. This change is + * automatically committed. + * @param state a new state to add. + */ + push(state: PersistentState) { + storage().Value = [ ...storage().Value, state ]; + }, + + /** + * Removes a persistent state from the backing store. This change is + * automatically committed. + * @param state the state to remove. + */ + remove(state: PersistentState) { + storage().Value = storage().Value.filter(stored => stored !== state); + }, + + /** + * Gets a list of all stored states. + * @returns all stored states. + */ + values() { + return storage().Value; + } + }; +})(); diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts index 2c890be2d8..04db708a5e 100644 --- a/Extension/src/LanguageServer/extension.ts +++ b/Extension/src/LanguageServer/extension.ts @@ -21,6 +21,7 @@ import { CppSettings } from './settings'; import { PersistentState } from './persistentState'; import { getLanguageConfig } from './languageConfig'; import { getCustomConfigProviders } from './customProviders'; +import { toggle as onOpenAssistantEditor } from './assistantEditor'; import * as rd from 'readline'; import * as yauzl from 'yauzl'; import { Readable } from 'stream'; @@ -384,6 +385,7 @@ export function registerCommands(enabled: boolean): void { commandDisposables.push(vscode.commands.registerCommand('C_Cpp.AddToIncludePath', enabled ? onAddToIncludePath : onDisabledCommand)); commandDisposables.push(vscode.commands.registerCommand('C_Cpp.EnableErrorSquiggles', enabled ? onEnableSquiggles : onDisabledCommand)); commandDisposables.push(vscode.commands.registerCommand('C_Cpp.DisableErrorSquiggles', enabled ? onDisableSquiggles : onDisabledCommand)); + commandDisposables.push(vscode.commands.registerCommand('C_Cpp.ToggleAssistantEditor', enabled ? onOpenAssistantEditor : onDisabledCommand)); commandDisposables.push(vscode.commands.registerCommand('C_Cpp.ToggleIncludeFallback', enabled ? onToggleIncludeFallback : onDisabledCommand)); commandDisposables.push(vscode.commands.registerCommand('C_Cpp.ToggleDimInactiveRegions', enabled ? onToggleDimInactiveRegions : onDisabledCommand)); commandDisposables.push(vscode.commands.registerCommand('C_Cpp.PauseParsing', enabled ? onPauseParsing : onDisabledCommand)); diff --git a/Extension/src/main.ts b/Extension/src/main.ts index abf257f0f2..1436ec22c9 100644 --- a/Extension/src/main.ts +++ b/Extension/src/main.ts @@ -23,6 +23,7 @@ import * as nls from 'vscode-nls'; import { cppBuildTaskProvider, CppBuildTaskProvider } from './LanguageServer/cppBuildTaskProvider'; import { getLocaleId, getLocalizedHtmlPath } from './LanguageServer/localization'; import { disposeOutputChannels, log } from './logger'; +import { restoreAll as restoreAssistantEditors } from './LanguageServer/assistantEditor'; nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFormat.standalone })(); const localize: nls.LocalizeFunc = nls.loadMessageBundle(); @@ -144,6 +145,8 @@ export async function activate(context: vscode.ExtensionContext): Promise