From 8e8db438c230d9c18d2bedbb7f0e9468e8dc9d06 Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 20 Mar 2018 11:12:35 +0100 Subject: [PATCH] simple editor: adress comments --- src/vs/editor/browser/widget/codeEditorWidget.ts | 2 +- src/vs/editor/common/commonCodeEditor.ts | 6 +++--- src/vs/editor/common/editorContextKeys.ts | 2 +- src/vs/workbench/parts/debug/electron-browser/replEditor.ts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vs/editor/browser/widget/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditorWidget.ts index 934f72d63fa..e4464652738 100644 --- a/src/vs/editor/browser/widget/codeEditorWidget.ts +++ b/src/vs/editor/browser/widget/codeEditorWidget.ts @@ -33,7 +33,7 @@ import { Color } from 'vs/base/common/color'; import { IMouseEvent } from 'vs/base/browser/mouseEvent'; import { ClassName } from 'vs/editor/common/model/intervalTree'; import { ITextModel, IModelDecorationOptions } from 'vs/editor/common/model'; -import { ICommandDelegate } from '../view/viewController'; +import { ICommandDelegate } from 'vs/editor/browser/view/viewController'; export abstract class CodeEditorWidget extends CommonCodeEditor implements editorBrowser.ICodeEditor { diff --git a/src/vs/editor/common/commonCodeEditor.ts b/src/vs/editor/common/commonCodeEditor.ts index 9a7e14b86b5..4d881572abc 100644 --- a/src/vs/editor/common/commonCodeEditor.ts +++ b/src/vs/editor/common/commonCodeEditor.ts @@ -1051,7 +1051,7 @@ class EditorContextKeysManager extends Disposable { private _editor: CommonCodeEditor; private _editorFocus: IContextKey; - private _inputFocus: IContextKey; + private _textInputFocus: IContextKey; private _editorTextFocus: IContextKey; private _editorTabMovesFocus: IContextKey; private _editorReadonly: IContextKey; @@ -1068,7 +1068,7 @@ class EditorContextKeysManager extends Disposable { contextKeyService.createKey('editorId', editor.getId()); this._editorFocus = EditorContextKeys.focus.bindTo(contextKeyService); - this._inputFocus = EditorContextKeys.inputFocus.bindTo(contextKeyService); + this._textInputFocus = EditorContextKeys.textInputFocus.bindTo(contextKeyService); this._editorTextFocus = EditorContextKeys.textFocus.bindTo(contextKeyService); this._editorTabMovesFocus = EditorContextKeys.tabMovesFocus.bindTo(contextKeyService); this._editorReadonly = EditorContextKeys.readOnly.bindTo(contextKeyService); @@ -1108,7 +1108,7 @@ class EditorContextKeysManager extends Disposable { private _updateFromFocus(): void { this._editorFocus.set(this._editor.hasWidgetFocus() && !this._editor.isSimpleWidget); this._editorTextFocus.set(this._editor.isFocused() && !this._editor.isSimpleWidget); - this._inputFocus.set(this._editor.isFocused()); + this._textInputFocus.set(this._editor.isFocused()); } } diff --git a/src/vs/editor/common/editorContextKeys.ts b/src/vs/editor/common/editorContextKeys.ts index 75196258037..ddde4cfe58d 100644 --- a/src/vs/editor/common/editorContextKeys.ts +++ b/src/vs/editor/common/editorContextKeys.ts @@ -19,7 +19,7 @@ export namespace EditorContextKeys { /** * A context key that is set when any editor input has focus (regular editor, repl input...). */ - export const inputFocus = new RawContextKey('inputFocus', false); + export const textInputFocus = new RawContextKey('textInputFocus', false); export const readOnly = new RawContextKey('editorReadonly', false); export const writable: ContextKeyExpr = readOnly.toNegated(); diff --git a/src/vs/workbench/parts/debug/electron-browser/replEditor.ts b/src/vs/workbench/parts/debug/electron-browser/replEditor.ts index 177e5fae2ff..98b0cb9abaa 100644 --- a/src/vs/workbench/parts/debug/electron-browser/replEditor.ts +++ b/src/vs/workbench/parts/debug/electron-browser/replEditor.ts @@ -30,7 +30,7 @@ export class ReplInputEditor extends CodeEditorWidget { @IContextKeyService contextKeyService: IContextKeyService, @IThemeService themeService: IThemeService ) { - super(domElement, options, true, instantiationService, codeEditorService, commandService, contextKeyService, themeService); + super(domElement, options, false, instantiationService, codeEditorService, commandService, contextKeyService, themeService); } protected _getContributions(): IEditorContributionCtor[] { -- GitLab