Merge from master

src/sql/parts/notebook/cellToggleMoreActions.ts

@@ -43,10 +43,10 @@ export class CellToggleMoreActions {
 		if (this._moreActionsElement.childNodes.length > 0) {
 			this._moreActionsElement.removeChild(this._moreActionsElement.childNodes[0]);
 		}
-		this._moreActions = new ActionBar(this._moreActionsElement, { orientation: ActionsOrientation.VERTICAL, isMenu: true });
+		this._moreActions = new ActionBar(this._moreActionsElement, { orientation: ActionsOrientation.VERTICAL });
 		this._moreActions.context = { target: this._moreActionsElement };
 		let validActions = this._actions.filter(a => a.canRun(context));
-		this._moreActions.push(this.instantiationService.createInstance(ToggleMoreWidgetAction, validActions, context), { icon: true, label: false });
+		this._moreActions.push(this.instantiationService.createInstance(ToggleMoreWidgetAction, validActions, context), { icon: true, label: false, isMenu: true });
 	}
 
 	public toggleVisible(visible: boolean): void {

src/sql/parts/notebook/cellViews/code.component.ts

@@ -248,9 +248,8 @@ export class CodeComponent extends AngularDisposable implements OnInit, OnChange
 
 	private updateLanguageMode(): void {
 		if (this._editorModel && this._editor) {
-			this._modeService.getOrCreateMode(this.cellModel.language).then((modeValue) => {
-				this._modelService.setMode(this._editorModel, modeValue);
-			});
+			let modeValue = this._modeService.create(this.cellModel.language);
+			this._modelService.setMode(this._editorModel, modeValue);
 		}
 	}
 

src/sql/parts/notebook/cellViews/textCell.component.ts

@@ -12,7 +12,7 @@ import * as themeColors from 'vs/workbench/common/theme';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Emitter } from 'vs/base/common/event';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 
 import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';

src/sql/parts/notebook/models/cell.ts

@@ -9,7 +9,7 @@
 import { nb } from 'sqlops';
 
 import { Event, Emitter } from 'vs/base/common/event';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 
 import { ICellModelOptions, IModelFactory, FutureInternal, CellExecutionState } from './modelInterfaces';

src/sql/parts/notebook/models/clientSession.ts

@@ -10,7 +10,7 @@
 
 import { nb } from 'sqlops';
 import * as nls from 'vs/nls';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Event, Emitter } from 'vs/base/common/event';
 
 import { IClientSession, IKernelPreference, IClientSessionOptions } from './modelInterfaces';

src/sql/parts/notebook/models/jsonext.ts

@@ -1,6 +1,6 @@
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 /**

src/sql/parts/notebook/models/modelInterfaces.ts

@@ -11,7 +11,7 @@
 import { nb } from 'sqlops';
 import { Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 
 import { CellType, NotebookChangeType } from 'sql/parts/notebook/models/contracts';

src/sql/parts/notebook/models/notebookModel.ts

@@ -21,7 +21,7 @@ import { NotebookContexts } from 'sql/parts/notebook/models/notebookContexts';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { INotification, Severity } from 'vs/platform/notification/common/notification';
 import { Schemas } from 'vs/base/common/network';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 

src/sql/parts/notebook/notebook.component.ts

@@ -19,7 +19,7 @@ import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { fillInActions, LabeledMenuItemActionItem } from 'vs/platform/actions/browser/menuItemActionItem';
 import { Schemas } from 'vs/base/common/network';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
 import * as paths from 'vs/base/common/paths';
 import { IWindowService } from 'vs/platform/windows/common/windows';
@@ -397,7 +397,7 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
 	private getLastActiveFilePath(untitledResource: URI): string {
 		let fileName = untitledResource.path + '.' + DEFAULT_NOTEBOOK_FILETYPE.toLocaleLowerCase();
 
-		let lastActiveFile = this.historyService.getLastActiveFile();
+		let lastActiveFile = this.historyService.getLastActiveFile(Schemas.file);
 		if (lastActiveFile) {
 			return URI.file(paths.join(paths.dirname(lastActiveFile.fsPath), fileName)).fsPath;
 		}
@@ -564,7 +564,7 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
 		if (this._model.cells.findIndex(c => c.cellUri.toString() === uriString) > -1) {
 			return cell.runCell(this.notificationService);
 		} else {
-			return Promise.reject<boolean>(new Error(localize('cellNotFound', 'cell with URI {0} was not found in this model', uriString)));
+			return Promise.reject(new Error(localize('cellNotFound', 'cell with URI {0} was not found in this model', uriString)));
 		}
 	}
 

src/sql/parts/notebook/notebookEditor.ts

@@ -8,7 +8,6 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import * as DOM from 'vs/base/browser/dom';
-import { $ } from 'vs/base/browser/builder';
 import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
@@ -17,6 +16,8 @@ import { NotebookInput } from 'sql/parts/notebook/notebookInput';
 import { NotebookModule } from 'sql/parts/notebook/notebook.module';
 import { NOTEBOOK_SELECTOR } from 'sql/parts/notebook/notebook.component';
 import { INotebookParams, DEFAULT_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/common/notebookService';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { $ } from 'sql/base/browser/builder';
 
 export class NotebookEditor extends BaseEditor {
 
@@ -27,8 +28,9 @@ export class NotebookEditor extends BaseEditor {
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IThemeService themeService: IThemeService,
 		@IInstantiationService private instantiationService: IInstantiationService,
+		@IStorageService storageService: IStorageService
 	) {
-		super(NotebookEditor.ID, telemetryService, themeService);
+		super(NotebookEditor.ID, telemetryService, themeService, storageService);
 	}
 
 	public get notebookInput(): NotebookInput {

src/sql/parts/notebook/notebookInput.ts

@@ -10,7 +10,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { IEditorModel } from 'vs/platform/editor/common/editor';
 import { EditorInput, EditorModel, ConfirmResult } from 'vs/workbench/common/editor';
 import { Emitter, Event } from 'vs/base/common/event';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as resources from 'vs/base/common/resources';
 import * as sqlops from 'sqlops';
 

src/sql/parts/notebook/outputs/common/url.ts

@@ -2,7 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 import { JSONObject } from '../../models/jsonext';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 /**
  * The namespace for URL-related functions.

src/sql/parts/notebook/outputs/renderers.ts

@@ -6,7 +6,7 @@
 import { default as AnsiUp } from 'ansi_up';
 import { IRenderMime } from './common/renderMimeInterfaces';
 import { URLExt } from './common/url';
-import URI from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 
 
 /**

src/sql/parts/notebook/outputs/widgets.ts

@@ -1,6 +1,6 @@
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 'use strict';