ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #4169 shows notification when not active code cell is selected when hit F5 (#5259)

Browse Source 
* Refine the msg
This commit is contained in:
Yurong He
2019-04-30 13:25:11 -07:00
committed by GitHub
parent 48682bacde
commit 44a2d009c0
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts
View File

@@ -31,6 +31,7 @@ import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/un
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
import { viewColumnToEditorGroup } from 'vs/workbench/api/common/shared/editor'; import { viewColumnToEditorGroup } from 'vs/workbench/api/common/shared/editor';
import { notebookModeId } from 'sql/workbench/common/customInputConverter'; import { notebookModeId } from 'sql/workbench/common/customInputConverter';
import { localize } from 'vs/nls';
class MainThreadNotebookEditor extends Disposable { class MainThreadNotebookEditor extends Disposable {
private _contentChangedEmitter = new Emitter<NotebookContentChange>(); private _contentChangedEmitter = new Emitter<NotebookContentChange>();
@@ -360,12 +361,9 @@ export class MainThreadNotebookDocumentsAndEditors extends Disposable implements
} else { } else {
// Use the active cell in this case, or 1st cell if there's none active // Use the active cell in this case, or 1st cell if there's none active
cell = editor.model.activeCell; cell = editor.model.activeCell;
if (!cell) {
cell = editor.cells.find(c => c.cellType === CellTypes.Code);
}
} }
if (!cell) { if (!cell || (cell && cell.cellType !== CellTypes.Code)) {
return Promise.reject(disposed(`Could not find cell for this Notebook`)); return Promise.reject(new Error(localize('runActiveCell', "F5 shortcut key requires a code cell to be selected. Please select a code cell to run.")));
} }
return editor.runCell(cell); return editor.runCell(cell);