fix NPE from #40110

This commit is contained in:
Martin Aeschlimann
2017-12-13 12:56:51 +01:00
parent db4954629c
commit babf0b6dc1
+9 -6
View File
@@ -332,12 +332,15 @@ abstract class FoldingAction<T> extends EditorAction {
if (!foldingController) {
return;
}
this.reportTelemetry(accessor, editor);
return foldingController.getFoldingModel().then(foldingModel => {
if (foldingModel) {
this.invoke(foldingController, foldingModel, editor, args);
}
});
let foldingModelPromise = foldingController.getFoldingModel();
if (foldingModelPromise) {
this.reportTelemetry(accessor, editor);
return foldingModelPromise.then(foldingModel => {
if (foldingModel) {
this.invoke(foldingController, foldingModel, editor, args);
}
});
}
}
protected getSelectedLines(editor: ICodeEditor) {