diff --git a/samples/sqlservices/package-lock.json b/samples/sqlservices/package-lock.json index 57034384cf..40008aa1cc 100644 --- a/samples/sqlservices/package-lock.json +++ b/samples/sqlservices/package-lock.json @@ -3121,6 +3121,19 @@ } } }, + "gulp-remote-src-vscode": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/gulp-remote-src-vscode/-/gulp-remote-src-vscode-0.5.0.tgz", + "integrity": "sha512-/9vtSk9eI9DEWCqzGieglPqmx0WUQ9pwPHyHFpKmfxqdgqGJC2l0vFMdYs54hLdDsMDEZFLDL2J4ikjc4hQ5HQ==", + "dev": true, + "requires": { + "event-stream": "3.3.4", + "node.extend": "1.1.6", + "request": "2.85.0", + "through2": "2.0.3", + "vinyl": "2.1.0" + } + }, "gulp-sourcemaps": { "version": "2.6.4", "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.4.tgz", @@ -7423,25 +7436,85 @@ } }, "vscode": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.14.tgz", - "integrity": "sha512-acfn3fzGtTm7UjChAN7/YjsC0qIyJeuSrJwvm6qb7tLN6Geq1FmCz1JnBOc3kaY+HCLjQBAfwG/CsgnasOdXMw==", + "version": "1.1.21", + "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.21.tgz", + "integrity": "sha512-tJl9eL15ZMm6vzCYYeQ26sSYRuXGMGPsaeIAmG2rOOYRn01jdaDg6I4b9G5Ed6FISdmn6egpKThk4o4om8Ax/A==", "dev": true, "requires": { "glob": "7.1.2", "gulp-chmod": "2.0.0", "gulp-filter": "5.1.0", "gulp-gunzip": "1.0.0", - "gulp-remote-src": "0.4.3", + "gulp-remote-src-vscode": "0.5.0", "gulp-symdest": "1.1.0", - "gulp-untar": "0.0.6", + "gulp-untar": "0.0.7", "gulp-vinyl-zip": "2.1.0", "mocha": "4.1.0", "request": "2.85.0", "semver": "5.5.0", "source-map-support": "0.5.4", - "url-parse": "1.3.0", + "url-parse": "1.4.3", "vinyl-source-stream": "1.1.2" + }, + "dependencies": { + "clone": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", + "dev": true + }, + "clone-stats": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", + "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", + "dev": true + }, + "gulp-untar": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/gulp-untar/-/gulp-untar-0.0.7.tgz", + "integrity": "sha512-0QfbCH2a1k2qkTLWPqTX+QO4qNsHn3kC546YhAP3/n0h+nvtyGITDuDrYBMDZeW4WnFijmkOvBWa5HshTic1tw==", + "dev": true, + "requires": { + "event-stream": "3.3.4", + "streamifier": "0.1.1", + "tar": "2.2.1", + "through2": "2.0.3", + "vinyl": "1.2.0" + } + }, + "querystringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.0.0.tgz", + "integrity": "sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==", + "dev": true + }, + "replace-ext": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", + "dev": true + }, + "url-parse": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz", + "integrity": "sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==", + "dev": true, + "requires": { + "querystringify": "2.0.0", + "requires-port": "1.0.0" + } + }, + "vinyl": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", + "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "dev": true, + "requires": { + "clone": "1.0.4", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } + } } }, "vscode-nls": { diff --git a/samples/sqlservices/package.json b/samples/sqlservices/package.json index 2cb677a53c..2e772b293b 100644 --- a/samples/sqlservices/package.json +++ b/samples/sqlservices/package.json @@ -5,7 +5,7 @@ "version": "0.0.1", "publisher": "demo", "engines": { - "vscode": "^1.21.0", + "vscode": "^1.26.0", "sqlops": "*" }, "categories": [ diff --git a/samples/sqlservices/src/controllers/mainController.ts b/samples/sqlservices/src/controllers/mainController.ts index 20a72d8e9e..937772954c 100644 --- a/samples/sqlservices/src/controllers/mainController.ts +++ b/samples/sqlservices/src/controllers/mainController.ts @@ -128,9 +128,11 @@ export default class MainController implements vscode.Disposable { } }); treeView.onDidChangeSelection(selectedNodes => { - selectedNodes.forEach(node => { - console.info('tree node selected: ' + node.label); - }); + if (selectedNodes && selectedNodes.selection) { + selectedNodes.selection.forEach(node => { + console.info('tree node selected: ' + node.label); + }); + } }); let formModel = view.modelBuilder.formContainer() .withFormItems([{ diff --git a/samples/sqlservices/yarn.lock b/samples/sqlservices/yarn.lock index 972949206e..c7f06ae77e 100644 --- a/samples/sqlservices/yarn.lock +++ b/samples/sqlservices/yarn.lock @@ -2865,6 +2865,10 @@ qs@~6.5.1: version "6.5.1" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8" +querystringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.0.0.tgz#fa3ed6e68eb15159457c89b37bc6472833195755" + querystringify@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb" @@ -3131,7 +3135,7 @@ require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" -requires-port@~1.0.0: +requires-port@^1.0.0, requires-port@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" @@ -3755,6 +3759,13 @@ url-parse@^1.1.9: querystringify "~1.0.0" requires-port "~1.0.0" +url-parse@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.3.tgz#bfaee455c889023219d757e045fa6a684ec36c15" + dependencies: + querystringify "^2.0.0" + requires-port "^1.0.0" + use@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/use/-/use-3.1.0.tgz#14716bf03fdfefd03040aef58d8b4b85f3a7c544" @@ -3933,9 +3944,9 @@ vscode-nls@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350" -vscode@^1.1.14: - version "1.1.18" - resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.1.18.tgz#e9227265dc72fc826bd6cd7bd21193f4e48fa671" +vscode@^1.1.18: + version "1.1.21" + resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.1.21.tgz#1c8253d6238aefb4112d6e58cf975ad25313dafc" dependencies: glob "^7.1.2" gulp-chmod "^2.0.0" @@ -3949,7 +3960,7 @@ vscode@^1.1.14: request "^2.83.0" semver "^5.4.1" source-map-support "^0.5.0" - url-parse "^1.1.9" + url-parse "^1.4.3" vinyl-source-stream "^1.1.0" vso-node-api@^6.1.2-preview: diff --git a/src/sql/parts/modelComponents/editor.component.ts b/src/sql/parts/modelComponents/editor.component.ts index 51f1406db3..141f5d9ee9 100644 --- a/src/sql/parts/modelComponents/editor.component.ts +++ b/src/sql/parts/modelComponents/editor.component.ts @@ -63,7 +63,7 @@ export default class EditorComponent extends ComponentBase implements IComponent this._editor.create(this._el.nativeElement); this._editor.setVisible(true); let uri = this.createUri(); - this._editorInput = instantiationService.createInstance(UntitledEditorInput, uri, false, 'sql', '', ''); + this._editorInput = instantiationService.createInstance(UntitledEditorInput, uri, false, 'plaintext', '', ''); this._editor.setInput(this._editorInput, undefined); this._editorInput.resolve().then(model => { this._editorModel = model.textEditorModel;