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

fix #51598

Browse Source
This commit is contained in:
Benjamin Pasero
2018-06-11 18:32:40 +02:00
parent 7d2e693a9b
commit dbc578db5d
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@
'use strict';
import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
import { ICodeEditor, getCodeEditor } 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';
@@ -114,25 +114,7 @@ export class MainThreadComments extends Disposable implements MainThreadComments
}
getFocusedEditor(): ICodeEditor {
let editor = this._codeEditorService.getFocusedCodeEditor();
if (!editor) {
/* please note that the type of `this._editorService.activeTextEditorWidget` is `{ IEditor as ICodeEditor } from 'vs/editor/common/editorCommon'`
* It's `IEditor` but renamed to `ICodeEditor`. The `ICodeEditor` in current context is `import { ICodeEditor } from 'vs/editor/browser/editorBrowser'`
* this._editorService.activeTextEditorWidget is
* 1. ICodeEditor extends editorCommon.IEditor
* 2. IDiffEditor extends editorCommon.IEditor
*/
const activeTextEditorWidget = this._editorService.activeTextEditorWidget;
if (activeTextEditorWidget) {
if ((activeTextEditorWidget as ICodeEditor).getContribution) {
return activeTextEditorWidget as ICodeEditor;
} else {
return (activeTextEditorWidget as IDiffEditor).getModifiedEditor();
}
}
}
return editor;
return this._codeEditorService.getFocusedCodeEditor() || getCodeEditor(this._editorService.activeControl);
}
async provideWorkspaceComments(): Promise<modes.CommentThread[]> {