Skip to content

Commit ecb6fc3

Browse files
committed
Fix merge mistake
1 parent ce863ce commit ecb6fc3

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

src/vs/workbench/contrib/notebook/browser/notebookEditor.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import 'vs/css!./notebook';
1212
import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
1313
import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
1414
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
15-
import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
15+
import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
1616
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
1717
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
1818
import { IStorageService } from 'vs/platform/storage/common/storage';
@@ -21,7 +21,7 @@ import { contrastBorder, editorBackground, focusBorder, foreground, textBlockQuo
2121
import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
2222
import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
2323
import { EditorOptions, IEditorMemento, ICompositeCodeEditor, IEditorCloseEvent } from 'vs/workbench/common/editor';
24-
import { INotebookEditor, NotebookLayoutInfo, CellState } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
24+
import { INotebookEditor, NotebookLayoutInfo, CellState, NOTEBOOK_EDITOR_FOCUSED } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
2525
import { NotebookEditorInput, NotebookEditorModel } from 'vs/workbench/contrib/notebook/browser/notebookEditorInput';
2626
import { INotebookService } from 'vs/workbench/contrib/notebook/browser/notebookService';
2727
import { OutputRenderer } from 'vs/workbench/contrib/notebook/browser/view/output/outputRenderer';
@@ -45,8 +45,6 @@ import { Range } from 'vs/editor/common/core/range';
4545
const $ = DOM.$;
4646
const NOTEBOOK_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'NotebookEditorViewState';
4747

48-
export const NOTEBOOK_EDITOR_FOCUSED = new RawContextKey<boolean>('notebookEditorFocused', false);
49-
5048
export class NotebookEditorOptions extends EditorOptions {
5149

5250
readonly cellOptions?: IResourceEditorInput;

0 commit comments

Comments
 (0)