Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 19:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

adopt new grid APIs

Browse Source
This commit is contained in:
Benjamin Pasero
2018-06-02 10:21:14 +02:00
committed by Peng Lyu
parent ad635f2b4c
commit 311e44fa4c
2 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vs/workbench/api/electron-browser/mainThreadComments.ts
View File

@@ -9,9 +9,8 @@ import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
import * as modes from 'vs/editor/common/modes';
import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
import { keys } from '../../../base/common/map';
import { IWorkbenchEditorService } from '../../services/editor/common/editorService';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { ExtHostCommentsShape, ExtHostContext, IExtHostContext, MainContext, MainThreadCommentsShape } from '../node/extHost.protocol';
import { ICommentService } from 'vs/workbench/services/comments/electron-browser/commentService';
@@ -29,15 +28,14 @@ export class MainThreadComments extends Disposable implements MainThreadComments
constructor(
extHostContext: IExtHostContext,
@IEditorGroupService editorGroupService: IEditorGroupService,
@IWorkbenchEditorService private _workbenchEditorService: IWorkbenchEditorService,
@IEditorService private _editorService: IEditorService,
@ICommentService private _commentService: ICommentService,
@IPanelService private _panelService: IPanelService,
@ICodeEditorService private _codeEditorService: ICodeEditorService
) {
super();
this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostComments);
editorGroupService.onEditorsChanged(e => {
this._editorService.onDidActiveEditorChange(e => {
const outerEditor = this.getFocusedEditor();
if (!outerEditor) {
return;
@@ -114,10 +112,7 @@ export class MainThreadComments extends Disposable implements MainThreadComments
getFocusedEditor(): ICodeEditor {
let editor = this._codeEditorService.getFocusedCodeEditor();
if (!editor) {
let activeEditor = this._workbenchEditorService.getActiveEditor();
if (activeEditor) {
editor = activeEditor.getControl() as ICodeEditor;
}
return this._editorService.activeTextEditorWidget as ICodeEditor;
}
return editor;