Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-02 06:21:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid NPE

Browse Source
This commit is contained in:
Alex Dima
2018-02-26 21:47:38 +01:00
parent 7e97f98c41
commit 5133a79e40
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/workbench/api/electron-browser/mainThreadEditor.ts
View File

@@ -33,13 +33,17 @@ export class MainThreadTextEditorProperties {
}
private static _readSelectionsFromCodeEditor(previousProperties: MainThreadTextEditorProperties, codeEditor: ICodeEditor): Selection[] {
let result: Selection[] = null;
if (codeEditor) {
return codeEditor.getSelections();
result = codeEditor.getSelections();
}
if (previousProperties) {
return previousProperties.selections;
if (!result && previousProperties) {
result = previousProperties.selections;
}
return [new Selection(1, 1, 1, 1)];
if (!result) {
result = [new Selection(1, 1, 1, 1)];
}
return result;
}
private static _readOptionsFromCodeEditor(previousProperties: MainThreadTextEditorProperties, model: ITextModel, codeEditor: ICodeEditor): IResolvedTextEditorConfiguration {