Skip to content

Commit 2d62fea

Browse files
committed
1 parent 6f21bd8 commit 2d62fea

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/vs/workbench/contrib/accessibility/browser/accessibleView.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/wi
1414
import { ITextModel } from 'vs/editor/common/model';
1515
import { IModelService } from 'vs/editor/common/services/model';
1616
import { AccessibilityHelpNLS } from 'vs/editor/common/standaloneStrings';
17-
import { LinkDetector } from 'vs/editor/contrib/links/browser/links';
1817
import { localize } from 'vs/nls';
1918
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
2019
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -24,7 +23,7 @@ import { IInstantiationService, createDecorator } from 'vs/platform/instantiatio
2423
import { IOpenerService } from 'vs/platform/opener/common/opener';
2524
import { alert } from 'vs/base/browser/ui/aria/aria';
2625
import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
27-
import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
26+
import { CodeActionController } from 'vs/editor/contrib/codeAction/browser/codeActionController';
2827

2928
const enum DEFAULT {
3029
WIDTH = 800,
@@ -87,7 +86,7 @@ class AccessibleView extends Disposable {
8786
this._editorContainer = document.createElement('div');
8887
this._editorContainer.classList.add('accessible-view');
8988
const codeEditorWidgetOptions: ICodeEditorWidgetOptions = {
90-
contributions: [...EditorExtensionsRegistry.getEditorContributions(), ...EditorExtensionsRegistry.getSomeEditorContributions([LinkDetector.ID, SelectionClipboardContributionID, 'editor.contrib.selectionAnchorController'])]
89+
contributions: EditorExtensionsRegistry.getEditorContributions().filter(c => c.id !== CodeActionController.ID)
9190
};
9291
const editorOptions: IEditorConstructionOptions = {
9392
...getSimpleEditorOptions(this._configurationService),

src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleWidget.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@ import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
1313
import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditorWidget';
1414
import { ITextModel } from 'vs/editor/common/model';
1515
import { IModelService } from 'vs/editor/common/services/model';
16-
import { LinkDetector } from 'vs/editor/contrib/links/browser/links';
1716
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
1817
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
1918
import { TerminalSettingId } from 'vs/platform/terminal/common/terminal';
20-
import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
2119
import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
2220
import { ITerminalInstance, ITerminalService, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
2321
import type { Terminal } from 'xterm';
2422
import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
23+
import { CodeActionController } from 'vs/editor/contrib/codeAction/browser/codeActionController';
2524

2625
const enum ClassName {
2726
Active = 'active',
@@ -62,7 +61,7 @@ export abstract class TerminalAccessibleWidget extends DisposableStore {
6261
this._element.classList.add(ClassName.Widget);
6362
this._editorContainer = document.createElement('div');
6463
const codeEditorWidgetOptions: ICodeEditorWidgetOptions = {
65-
contributions: [...EditorExtensionsRegistry.getEditorContributions(), ...EditorExtensionsRegistry.getSomeEditorContributions([LinkDetector.ID, SelectionClipboardContributionID, 'editor.contrib.selectionAnchorController'])]
64+
contributions: EditorExtensionsRegistry.getEditorContributions().filter(c => c.id !== CodeActionController.ID)
6665
};
6766
const font = _xterm.getFont();
6867
const editorOptions: IEditorConstructionOptions = {

0 commit comments

Comments
 (0)