From db327beb63133f6867552d6a87b61c977e079450 Mon Sep 17 00:00:00 2001 From: KapitanOczywisty <44417092+KapitanOczywisty@users.noreply.github.com> Date: Tue, 8 Sep 2020 20:59:15 +0200 Subject: [PATCH 1/2] Update example: allow peek definition --- ...ervices-configure-javascript-defaults.html | 23 +++++++++++-------- .../configure-javascript-defaults/sample.js | 23 +++++++++++-------- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/test/playground.generated/extending-language-services-configure-javascript-defaults.html b/test/playground.generated/extending-language-services-configure-javascript-defaults.html index 6fdcf396..19a6adcf 100644 --- a/test/playground.generated/extending-language-services-configure-javascript-defaults.html +++ b/test/playground.generated/extending-language-services-configure-javascript-defaults.html @@ -53,28 +53,33 @@ monaco.languages.typescript.javascriptDefaults.setCompilerOptions({ }); // extra libraries -monaco.languages.typescript.javascriptDefaults.addExtraLib([ +var libSource = [ 'declare class Facts {', ' /**', ' * Returns the next fact', ' */', ' static next():string', '}', -].join('\n'), 'ts:filename/facts.d.ts'); +].join('\n'); +var libUri = 'ts:filename/facts.d.ts'; +monaco.languages.typescript.javascriptDefaults.addExtraLib(libSource, libUri); +// When resolving definitions and references, editor will try to use created models. +// Following line allows "peek definition/references" commands to work with library. +monaco.editor.createModel(libSource, 'typescript', monaco.Uri.parse(libUri)); var jsCode = [ '"use strict";', '', - "class Chuck {", - " greet() {", - " return Facts.next();", - " }", - "}" + 'class Chuck {', + ' greet() {', + ' return Facts.next();', + ' }', + '}' ].join('\n'); -monaco.editor.create(document.getElementById("container"), { +monaco.editor.create(document.getElementById('container'), { value: jsCode, - language: "javascript" + language: 'javascript' }); diff --git a/website/playground/new-samples/extending-language-services/configure-javascript-defaults/sample.js b/website/playground/new-samples/extending-language-services/configure-javascript-defaults/sample.js index f8c8f263..3b07f6ad 100644 --- a/website/playground/new-samples/extending-language-services/configure-javascript-defaults/sample.js +++ b/website/playground/new-samples/extending-language-services/configure-javascript-defaults/sample.js @@ -16,26 +16,31 @@ monaco.languages.typescript.javascriptDefaults.setCompilerOptions({ }); // extra libraries -monaco.languages.typescript.javascriptDefaults.addExtraLib([ +var libSource = [ 'declare class Facts {', ' /**', ' * Returns the next fact', ' */', ' static next():string', '}', -].join('\n'), 'ts:filename/facts.d.ts'); +].join('\n'); +var libUri = 'ts:filename/facts.d.ts'; +monaco.languages.typescript.javascriptDefaults.addExtraLib(libSource, libUri); +// When resolving definitions and references, editor will try to use created models. +// Following line allows "peek definition/references" commands to work with library. +monaco.editor.createModel(libSource, 'typescript', monaco.Uri.parse(libUri)); var jsCode = [ '"use strict";', '', - "class Chuck {", - " greet() {", - " return Facts.next();", - " }", - "}" + 'class Chuck {', + ' greet() {', + ' return Facts.next();', + ' }', + '}' ].join('\n'); -monaco.editor.create(document.getElementById("container"), { +monaco.editor.create(document.getElementById('container'), { value: jsCode, - language: "javascript" + language: 'javascript' }); From 1b3947488650948340159f24a976c9a40a446f18 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Thu, 17 Sep 2020 22:23:21 +0200 Subject: [PATCH 2/2] Minor edits --- gulpfile.js | 2 ++ ...nding-language-services-configure-javascript-defaults.html | 4 ++-- .../configure-javascript-defaults/sample.js | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 9341c27e..e3e061d8 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -832,6 +832,8 @@ function createSimpleServer(rootDir, port) { }); } +gulp.task('generate-test-samples', taskSeries(generateTestSamplesTask)); + gulp.task('simpleserver', taskSeries(generateTestSamplesTask, function() { const SERVER_ROOT = path.normalize(path.join(__dirname, '../')); createSimpleServer(SERVER_ROOT, 8080); diff --git a/test/playground.generated/extending-language-services-configure-javascript-defaults.html b/test/playground.generated/extending-language-services-configure-javascript-defaults.html index 19a6adcf..271d7c07 100644 --- a/test/playground.generated/extending-language-services-configure-javascript-defaults.html +++ b/test/playground.generated/extending-language-services-configure-javascript-defaults.html @@ -63,8 +63,8 @@ var libSource = [ ].join('\n'); var libUri = 'ts:filename/facts.d.ts'; monaco.languages.typescript.javascriptDefaults.addExtraLib(libSource, libUri); -// When resolving definitions and references, editor will try to use created models. -// Following line allows "peek definition/references" commands to work with library. +// When resolving definitions and references, the editor will try to use created models. +// Creating a model for the library allows "peek definition/references" commands to work with the library. monaco.editor.createModel(libSource, 'typescript', monaco.Uri.parse(libUri)); var jsCode = [ diff --git a/website/playground/new-samples/extending-language-services/configure-javascript-defaults/sample.js b/website/playground/new-samples/extending-language-services/configure-javascript-defaults/sample.js index 3b07f6ad..fed8f0d4 100644 --- a/website/playground/new-samples/extending-language-services/configure-javascript-defaults/sample.js +++ b/website/playground/new-samples/extending-language-services/configure-javascript-defaults/sample.js @@ -26,8 +26,8 @@ var libSource = [ ].join('\n'); var libUri = 'ts:filename/facts.d.ts'; monaco.languages.typescript.javascriptDefaults.addExtraLib(libSource, libUri); -// When resolving definitions and references, editor will try to use created models. -// Following line allows "peek definition/references" commands to work with library. +// When resolving definitions and references, the editor will try to use created models. +// Creating a model for the library allows "peek definition/references" commands to work with the library. monaco.editor.createModel(libSource, 'typescript', monaco.Uri.parse(libUri)); var jsCode = [