Merge from vscode 9bc92b48d945144abb405b9e8df05e18accb9148

src/sql/workbench/browser/editData/editDataInput.ts

@@ -114,7 +114,7 @@ export class EditDataInput extends EditorInput implements IConnectableInput {
 	public save(): Promise<IEditorInput | undefined> { return Promise.resolve(undefined); }
 	public getTypeId(): string { return EditDataInput.ID; }
 	public setBootstrappedTrue(): void { this._hasBootstrapped = true; }
-	public getResource(): URI { return this._uri; }
+	public get resource(): URI { return this._uri; }
 	public supportsSplitEditor(): boolean { return false; }
 	public setupComplete() { this._setup = true; }
 	public get queryString(): string {

src/sql/workbench/browser/editData/editDataResultsInput.ts

@@ -5,6 +5,7 @@
 
 import { EditorInput } from 'vs/workbench/common/editor';
 import { Emitter } from 'vs/base/common/event';
+import { URI } from 'vs/base/common/uri';
 
 /**
  * Input for the EditDataResultsEditor. This input helps with logic for the viewing and editing of
@@ -102,4 +103,8 @@ export class EditDataResultsInput extends EditorInput {
 	get uri(): string {
 		return unescape(this._uri);
 	}
+
+	get resource(): URI | undefined {
+		return undefined;
+	}
 }