From 35c57b599039469c56cce1deebaed43cc2a33c1b Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 9 Jan 2019 16:14:09 +0100 Subject: [PATCH] Adopt native promises --- src/_.contribution.ts | 8 ++++---- src/apex/apex.contribution.ts | 5 +---- src/azcli/azcli.contribution.ts | 5 +---- src/bat/bat.contribution.ts | 5 +---- src/clojure/clojure.contribution.ts | 6 +----- src/coffee/coffee.contribution.ts | 5 +---- src/cpp/cpp.contribution.ts | 7 ++----- src/csharp/csharp.contribution.ts | 5 +---- src/csp/csp.contribution.ts | 5 +---- src/css/css.contribution.ts | 5 +---- src/dockerfile/dockerfile.contribution.ts | 5 +---- src/fsharp/fsharp.contribution.ts | 5 +---- src/go/go.contribution.ts | 5 +---- src/handlebars/handlebars.contribution.ts | 5 +---- src/html/html.contribution.ts | 5 +---- src/ini/ini.contribution.ts | 5 +---- src/java/java.contribution.ts | 5 +---- src/javascript/javascript.contribution.ts | 5 +---- src/less/less.contribution.ts | 5 +---- src/lua/lua.contribution.ts | 5 +---- src/markdown/markdown.contribution.ts | 5 +---- src/msdax/msdax.contribution.ts | 5 +---- src/mysql/mysql.contribution.ts | 5 +---- src/objective-c/objective-c.contribution.ts | 5 +---- src/perl/perl.contribution.ts | 5 +---- src/pgsql/pgsql.contribution.ts | 5 +---- src/php/php.contribution.ts | 5 +---- src/postiats/postiats.contribution.ts | 5 +---- src/powerquery/powerquery.contribution.ts | 5 +---- src/powershell/powershell.contribution.ts | 5 +---- src/pug/pug.contribution.ts | 5 +---- src/python/python.contribution.ts | 5 +---- src/r/r.contribution.ts | 5 +---- src/razor/razor.contribution.ts | 5 +---- src/redis/redis.contribution.ts | 5 +---- src/redshift/redshift.contribution.ts | 5 +---- src/ruby/ruby.contribution.ts | 5 +---- src/rust/rust.contribution.ts | 5 +---- src/sb/sb.contribution.ts | 5 +---- src/scheme/scheme.contribution.ts | 6 +----- src/scss/scss.contribution.ts | 5 +---- src/shell/shell.contribution.ts | 6 +----- src/solidity/solidity.contribution.ts | 5 +---- src/sql/sql.contribution.ts | 5 +---- src/st/st.contribution.ts | 5 +---- src/swift/swift.contribution.ts | 5 +---- src/typescript/typescript.contribution.ts | 5 +---- src/vb/vb.contribution.ts | 5 +---- src/xml/xml.contribution.ts | 5 +---- src/yaml/yaml.contribution.ts | 5 +---- 50 files changed, 54 insertions(+), 204 deletions(-) diff --git a/src/_.contribution.ts b/src/_.contribution.ts index 80594a56..5aafec65 100644 --- a/src/_.contribution.ts +++ b/src/_.contribution.ts @@ -8,7 +8,7 @@ const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); interface ILang extends monaco.languages.ILanguageExtensionPoint { - loader: () => monaco.Promise; + loader: () => Promise; } interface ILangImpl { @@ -18,7 +18,7 @@ interface ILangImpl { let languageDefinitions: { [languageId: string]: ILang } = {}; -function _loadLanguage(languageId: string): monaco.Promise { +function _loadLanguage(languageId: string): Promise { const loader = languageDefinitions[languageId].loader; return loader().then((mod) => { _monaco.languages.setMonarchTokensProvider(languageId, mod.language); @@ -26,9 +26,9 @@ function _loadLanguage(languageId: string): monaco.Promise { }); } -let languagePromises: { [languageId: string]: monaco.Promise } = {}; +let languagePromises: { [languageId: string]: Promise } = {}; -export function loadLanguage(languageId: string): monaco.Promise { +export function loadLanguage(languageId: string): Promise { if (!languagePromises[languageId]) { languagePromises[languageId] = _loadLanguage(languageId); } diff --git a/src/apex/apex.contribution.ts b/src/apex/apex.contribution.ts index d7a38595..921873df 100644 --- a/src/apex/apex.contribution.ts +++ b/src/apex/apex.contribution.ts @@ -6,13 +6,10 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'apex', extensions: ['.cls'], aliases: ['Apex', 'apex'], mimetypes: ['text/x-apex-source', 'text/x-apex'], - loader: () => _monaco.Promise.wrap(import('./apex')) + loader: () => import('./apex') }); diff --git a/src/azcli/azcli.contribution.ts b/src/azcli/azcli.contribution.ts index c94c07bd..50511a41 100644 --- a/src/azcli/azcli.contribution.ts +++ b/src/azcli/azcli.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'azcli', extensions: ['.azcli'], aliases: ['Azure CLI', 'azcli'], - loader: () => _monaco.Promise.wrap(import('./azcli')) + loader: () => import('./azcli') }); diff --git a/src/bat/bat.contribution.ts b/src/bat/bat.contribution.ts index 91261712..a17f9d0f 100644 --- a/src/bat/bat.contribution.ts +++ b/src/bat/bat.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'bat', extensions: ['.bat', '.cmd'], aliases: ['Batch', 'bat'], - loader: () => _monaco.Promise.wrap(import('./bat')) + loader: () => import('./bat') }); diff --git a/src/clojure/clojure.contribution.ts b/src/clojure/clojure.contribution.ts index fc0e885f..01c6738d 100644 --- a/src/clojure/clojure.contribution.ts +++ b/src/clojure/clojure.contribution.ts @@ -6,13 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = - typeof monaco === 'undefined' ? (self).monaco : monaco; - registerLanguage({ id: 'clojure', extensions: ['.clj', '.clojure'], aliases: ['clojure', 'Clojure'], - loader: () => _monaco.Promise.wrap(import('./clojure')), + loader: () => import('./clojure') }); diff --git a/src/coffee/coffee.contribution.ts b/src/coffee/coffee.contribution.ts index 2e180f64..67f67311 100644 --- a/src/coffee/coffee.contribution.ts +++ b/src/coffee/coffee.contribution.ts @@ -6,13 +6,10 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'coffeescript', extensions: ['.coffee'], aliases: ['CoffeeScript', 'coffeescript', 'coffee'], mimetypes: ['text/x-coffeescript', 'text/coffeescript'], - loader: () => _monaco.Promise.wrap(import('./coffee')) + loader: () => import('./coffee') }); diff --git a/src/cpp/cpp.contribution.ts b/src/cpp/cpp.contribution.ts index e69b052b..60700bff 100644 --- a/src/cpp/cpp.contribution.ts +++ b/src/cpp/cpp.contribution.ts @@ -6,18 +6,15 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'c', extensions: ['.c', '.h'], aliases: ['C', 'c'], - loader: () => _monaco.Promise.wrap(import('./cpp')) + loader: () => import('./cpp') }); registerLanguage({ id: 'cpp', extensions: ['.cpp', '.cc', '.cxx', '.hpp', '.hh', '.hxx'], aliases: ['C++', 'Cpp', 'cpp'], - loader: () => _monaco.Promise.wrap(import('./cpp')) + loader: () => import('./cpp') }); diff --git a/src/csharp/csharp.contribution.ts b/src/csharp/csharp.contribution.ts index ba1b4c8a..3a34f302 100644 --- a/src/csharp/csharp.contribution.ts +++ b/src/csharp/csharp.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'csharp', extensions: ['.cs', '.csx', '.cake'], aliases: ['C#', 'csharp'], - loader: () => _monaco.Promise.wrap(import('./csharp')) + loader: () => import('./csharp') }); diff --git a/src/csp/csp.contribution.ts b/src/csp/csp.contribution.ts index 3deef58d..bd522448 100644 --- a/src/csp/csp.contribution.ts +++ b/src/csp/csp.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'csp', extensions: [], aliases: ['CSP', 'csp'], - loader: () => _monaco.Promise.wrap(import('./csp')) + loader: () => import('./csp') }); diff --git a/src/css/css.contribution.ts b/src/css/css.contribution.ts index bb39d00f..f434e2dc 100644 --- a/src/css/css.contribution.ts +++ b/src/css/css.contribution.ts @@ -6,13 +6,10 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'css', extensions: ['.css'], aliases: ['CSS', 'css'], mimetypes: ['text/css'], - loader: () => _monaco.Promise.wrap(import('./css')) + loader: () => import('./css') }); diff --git a/src/dockerfile/dockerfile.contribution.ts b/src/dockerfile/dockerfile.contribution.ts index d4200e08..30cb3ba7 100644 --- a/src/dockerfile/dockerfile.contribution.ts +++ b/src/dockerfile/dockerfile.contribution.ts @@ -6,13 +6,10 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'dockerfile', extensions: ['.dockerfile'], filenames: ['Dockerfile'], aliases: ['Dockerfile'], - loader: () => _monaco.Promise.wrap(import('./dockerfile')) + loader: () => import('./dockerfile') }); diff --git a/src/fsharp/fsharp.contribution.ts b/src/fsharp/fsharp.contribution.ts index bd9a0c05..0cae93f7 100644 --- a/src/fsharp/fsharp.contribution.ts +++ b/src/fsharp/fsharp.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'fsharp', extensions: ['.fs', '.fsi', '.ml', '.mli', '.fsx', '.fsscript'], aliases: ['F#', 'FSharp', 'fsharp'], - loader: () => _monaco.Promise.wrap(import('./fsharp')) + loader: () => import('./fsharp') }); diff --git a/src/go/go.contribution.ts b/src/go/go.contribution.ts index 2e0bd2cd..76771e01 100644 --- a/src/go/go.contribution.ts +++ b/src/go/go.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'go', extensions: ['.go'], aliases: ['Go'], - loader: () => _monaco.Promise.wrap(import('./go')) + loader: () => import('./go') }); diff --git a/src/handlebars/handlebars.contribution.ts b/src/handlebars/handlebars.contribution.ts index a0252eed..de7bd310 100644 --- a/src/handlebars/handlebars.contribution.ts +++ b/src/handlebars/handlebars.contribution.ts @@ -6,13 +6,10 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'handlebars', extensions: ['.handlebars', '.hbs'], aliases: ['Handlebars', 'handlebars'], mimetypes: ['text/x-handlebars-template'], - loader: () => _monaco.Promise.wrap(import('./handlebars')) + loader: () => import('./handlebars') }); diff --git a/src/html/html.contribution.ts b/src/html/html.contribution.ts index a9eabe15..ec632e8e 100644 --- a/src/html/html.contribution.ts +++ b/src/html/html.contribution.ts @@ -6,13 +6,10 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'html', extensions: ['.html', '.htm', '.shtml', '.xhtml', '.mdoc', '.jsp', '.asp', '.aspx', '.jshtm'], aliases: ['HTML', 'htm', 'html', 'xhtml'], mimetypes: ['text/html', 'text/x-jshtm', 'text/template', 'text/ng-template'], - loader: () => _monaco.Promise.wrap(import('./html')) + loader: () => import('./html') }); diff --git a/src/ini/ini.contribution.ts b/src/ini/ini.contribution.ts index a8344d48..7176bdcb 100644 --- a/src/ini/ini.contribution.ts +++ b/src/ini/ini.contribution.ts @@ -6,13 +6,10 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'ini', extensions: ['.ini', '.properties', '.gitconfig'], filenames: ['config', '.gitattributes', '.gitconfig', '.editorconfig'], aliases: ['Ini', 'ini'], - loader: () => _monaco.Promise.wrap(import('./ini')) + loader: () => import('./ini') }); diff --git a/src/java/java.contribution.ts b/src/java/java.contribution.ts index 866a69be..1680542d 100644 --- a/src/java/java.contribution.ts +++ b/src/java/java.contribution.ts @@ -6,13 +6,10 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'java', extensions: ['.java', '.jav'], aliases: ['Java', 'java'], mimetypes: ['text/x-java-source', 'text/x-java'], - loader: () => _monaco.Promise.wrap(import('./java')) + loader: () => import('./java') }); diff --git a/src/javascript/javascript.contribution.ts b/src/javascript/javascript.contribution.ts index 32c75b71..8f3cc5cb 100644 --- a/src/javascript/javascript.contribution.ts +++ b/src/javascript/javascript.contribution.ts @@ -6,9 +6,6 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'javascript', extensions: ['.js', '.es6', '.jsx'], @@ -16,5 +13,5 @@ registerLanguage({ filenames: ['jakefile'], aliases: ['JavaScript', 'javascript', 'js'], mimetypes: ['text/javascript'], - loader: () => _monaco.Promise.wrap(import('./javascript')) + loader: () => import('./javascript') }); diff --git a/src/less/less.contribution.ts b/src/less/less.contribution.ts index cc61fbce..ccaf885a 100644 --- a/src/less/less.contribution.ts +++ b/src/less/less.contribution.ts @@ -6,13 +6,10 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'less', extensions: ['.less'], aliases: ['Less', 'less'], mimetypes: ['text/x-less', 'text/less'], - loader: () => _monaco.Promise.wrap(import('./less')) + loader: () => import('./less') }); diff --git a/src/lua/lua.contribution.ts b/src/lua/lua.contribution.ts index bec757e0..274f7780 100644 --- a/src/lua/lua.contribution.ts +++ b/src/lua/lua.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'lua', extensions: ['.lua'], aliases: ['Lua', 'lua'], - loader: () => _monaco.Promise.wrap(import('./lua')) + loader: () => import('./lua') }); diff --git a/src/markdown/markdown.contribution.ts b/src/markdown/markdown.contribution.ts index 0aa96e6d..16563180 100644 --- a/src/markdown/markdown.contribution.ts +++ b/src/markdown/markdown.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'markdown', extensions: ['.md', '.markdown', '.mdown', '.mkdn', '.mkd', '.mdwn', '.mdtxt', '.mdtext'], aliases: ['Markdown', 'markdown'], - loader: () => _monaco.Promise.wrap(import('./markdown')) + loader: () => import('./markdown') }); diff --git a/src/msdax/msdax.contribution.ts b/src/msdax/msdax.contribution.ts index 69df2d00..381f6907 100644 --- a/src/msdax/msdax.contribution.ts +++ b/src/msdax/msdax.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'msdax', extensions: ['.dax', '.msdax'], aliases: ['DAX', 'MSDAX'], - loader: () => _monaco.Promise.wrap(import('./msdax')) + loader: () => import('./msdax') }); diff --git a/src/mysql/mysql.contribution.ts b/src/mysql/mysql.contribution.ts index f1476d28..9525a188 100644 --- a/src/mysql/mysql.contribution.ts +++ b/src/mysql/mysql.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'mysql', extensions: [], aliases: ['MySQL', 'mysql'], - loader: () => _monaco.Promise.wrap(import('./mysql')) + loader: () => import('./mysql') }); diff --git a/src/objective-c/objective-c.contribution.ts b/src/objective-c/objective-c.contribution.ts index e57176f0..ea333e59 100644 --- a/src/objective-c/objective-c.contribution.ts +++ b/src/objective-c/objective-c.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'objective-c', extensions: ['.m'], aliases: ['Objective-C'], - loader: () => _monaco.Promise.wrap(import('./objective-c')) + loader: () => import('./objective-c') }); diff --git a/src/perl/perl.contribution.ts b/src/perl/perl.contribution.ts index 0f18b87f..11ecff9e 100644 --- a/src/perl/perl.contribution.ts +++ b/src/perl/perl.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = typeof monaco === 'undefined' ? (self).monaco : monaco; - registerLanguage({ id: 'perl', extensions: ['.pl'], aliases: ['Perl', 'pl'], - loader: () => _monaco.Promise.wrap(import('./perl')), + loader: () => import('./perl'), }); diff --git a/src/pgsql/pgsql.contribution.ts b/src/pgsql/pgsql.contribution.ts index f3ff6b4c..e3d2f330 100644 --- a/src/pgsql/pgsql.contribution.ts +++ b/src/pgsql/pgsql.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'pgsql', extensions: [], aliases: ['PostgreSQL', 'postgres', 'pg', 'postgre'], - loader: () => _monaco.Promise.wrap(import('./pgsql')) + loader: () => import('./pgsql') }); diff --git a/src/php/php.contribution.ts b/src/php/php.contribution.ts index c5df88db..890a2235 100644 --- a/src/php/php.contribution.ts +++ b/src/php/php.contribution.ts @@ -6,13 +6,10 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'php', extensions: ['.php', '.php4', '.php5', '.phtml', '.ctp'], aliases: ['PHP', 'php'], mimetypes: ['application/x-php'], - loader: () => _monaco.Promise.wrap(import('./php')) + loader: () => import('./php') }); diff --git a/src/postiats/postiats.contribution.ts b/src/postiats/postiats.contribution.ts index 77e7c2b7..406350df 100644 --- a/src/postiats/postiats.contribution.ts +++ b/src/postiats/postiats.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'postiats', extensions: ['.dats', '.sats', '.hats'], aliases: ['ATS', 'ATS/Postiats'], - loader: () => _monaco.Promise.wrap(import('./postiats')) + loader: () => import('./postiats') }); diff --git a/src/powerquery/powerquery.contribution.ts b/src/powerquery/powerquery.contribution.ts index 7ffdd692..4a7ebf65 100644 --- a/src/powerquery/powerquery.contribution.ts +++ b/src/powerquery/powerquery.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'powerquery', extensions: ['.pq', '.pqm'], aliases: ['PQ', 'M', 'Power Query', 'Power Query M'], - loader: () => _monaco.Promise.wrap(import('./powerquery')) + loader: () => import('./powerquery') }); diff --git a/src/powershell/powershell.contribution.ts b/src/powershell/powershell.contribution.ts index 7b83a61e..4ff5d4f1 100644 --- a/src/powershell/powershell.contribution.ts +++ b/src/powershell/powershell.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'powershell', extensions: ['.ps1', '.psm1', '.psd1'], aliases: ['PowerShell', 'powershell', 'ps', 'ps1'], - loader: () => _monaco.Promise.wrap(import('./powershell')) + loader: () => import('./powershell') }); diff --git a/src/pug/pug.contribution.ts b/src/pug/pug.contribution.ts index f1e0e9d5..f8bba8d4 100644 --- a/src/pug/pug.contribution.ts +++ b/src/pug/pug.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'pug', extensions: ['.jade', '.pug'], aliases: ['Pug', 'Jade', 'jade'], - loader: () => _monaco.Promise.wrap(import('./pug')) + loader: () => import('./pug') }); diff --git a/src/python/python.contribution.ts b/src/python/python.contribution.ts index 10c25580..4fad385b 100644 --- a/src/python/python.contribution.ts +++ b/src/python/python.contribution.ts @@ -6,13 +6,10 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'python', extensions: ['.py', '.rpy', '.pyw', '.cpy', '.gyp', '.gypi'], aliases: ['Python', 'py'], firstLine: '^#!/.*\\bpython[0-9.-]*\\b', - loader: () => _monaco.Promise.wrap(import('./python')) + loader: () => import('./python') }); diff --git a/src/r/r.contribution.ts b/src/r/r.contribution.ts index 7857845a..c78eedbe 100644 --- a/src/r/r.contribution.ts +++ b/src/r/r.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'r', extensions: ['.r', '.rhistory', '.rprofile', '.rt'], aliases: ['R', 'r'], - loader: () => _monaco.Promise.wrap(import('./r')) + loader: () => import('./r') }); diff --git a/src/razor/razor.contribution.ts b/src/razor/razor.contribution.ts index 96d762f2..631393bf 100644 --- a/src/razor/razor.contribution.ts +++ b/src/razor/razor.contribution.ts @@ -6,13 +6,10 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'razor', extensions: ['.cshtml'], aliases: ['Razor', 'razor'], mimetypes: ['text/x-cshtml'], - loader: () => _monaco.Promise.wrap(import('./razor')) + loader: () => import('./razor') }); diff --git a/src/redis/redis.contribution.ts b/src/redis/redis.contribution.ts index f9cbed66..db5d99f1 100644 --- a/src/redis/redis.contribution.ts +++ b/src/redis/redis.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'redis', extensions: ['.redis'], aliases: ['redis'], - loader: () => _monaco.Promise.wrap(import('./redis')) + loader: () => import('./redis') }); diff --git a/src/redshift/redshift.contribution.ts b/src/redshift/redshift.contribution.ts index f40d0803..b5d55580 100644 --- a/src/redshift/redshift.contribution.ts +++ b/src/redshift/redshift.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'redshift', extensions: [], aliases: ['Redshift', 'redshift'], - loader: () => _monaco.Promise.wrap(import('./redshift')) + loader: () => import('./redshift') }); diff --git a/src/ruby/ruby.contribution.ts b/src/ruby/ruby.contribution.ts index 24e290ff..5bc17f0c 100644 --- a/src/ruby/ruby.contribution.ts +++ b/src/ruby/ruby.contribution.ts @@ -6,13 +6,10 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'ruby', extensions: ['.rb', '.rbx', '.rjs', '.gemspec', '.pp'], filenames: ['rakefile'], aliases: ['Ruby', 'rb'], - loader: () => _monaco.Promise.wrap(import('./ruby')) + loader: () => import('./ruby') }); diff --git a/src/rust/rust.contribution.ts b/src/rust/rust.contribution.ts index 15dd4f29..e19552d3 100644 --- a/src/rust/rust.contribution.ts +++ b/src/rust/rust.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'rust', extensions: ['.rs', '.rlib'], aliases: ['Rust', 'rust'], - loader: () => _monaco.Promise.wrap(import('./rust')) + loader: () => import('./rust') }); diff --git a/src/sb/sb.contribution.ts b/src/sb/sb.contribution.ts index d35dc0b9..a884be64 100644 --- a/src/sb/sb.contribution.ts +++ b/src/sb/sb.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'sb', extensions: ['.sb'], aliases: ['Small Basic', 'sb'], - loader: () => _monaco.Promise.wrap(import('./sb')) + loader: () => import('./sb') }); diff --git a/src/scheme/scheme.contribution.ts b/src/scheme/scheme.contribution.ts index ac8eb9b2..5e889627 100644 --- a/src/scheme/scheme.contribution.ts +++ b/src/scheme/scheme.contribution.ts @@ -6,13 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = - typeof monaco === 'undefined' ? (self).monaco : monaco; - registerLanguage({ id: 'scheme', extensions: ['.scm', '.ss', '.sch', '.rkt'], aliases: ['scheme', 'Scheme'], - loader: () => _monaco.Promise.wrap(import('./scheme')), + loader: () => import('./scheme'), }); diff --git a/src/scss/scss.contribution.ts b/src/scss/scss.contribution.ts index bc9634fc..5823653d 100644 --- a/src/scss/scss.contribution.ts +++ b/src/scss/scss.contribution.ts @@ -6,13 +6,10 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'scss', extensions: ['.scss'], aliases: ['Sass', 'sass', 'scss'], mimetypes: ['text/x-scss', 'text/scss'], - loader: () => _monaco.Promise.wrap(import('./scss')) + loader: () => import('./scss') }); diff --git a/src/shell/shell.contribution.ts b/src/shell/shell.contribution.ts index a73f71bc..fec2f18f 100644 --- a/src/shell/shell.contribution.ts +++ b/src/shell/shell.contribution.ts @@ -6,13 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = - typeof monaco === 'undefined' ? (self).monaco : monaco; - registerLanguage({ id: 'shell', extensions: ['.sh', '.bash'], aliases: ['Shell', 'sh'], - loader: () => _monaco.Promise.wrap(import('./shell')), + loader: () => import('./shell'), }); diff --git a/src/solidity/solidity.contribution.ts b/src/solidity/solidity.contribution.ts index 98d465de..53525cd9 100644 --- a/src/solidity/solidity.contribution.ts +++ b/src/solidity/solidity.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'sol', extensions: ['.sol'], aliases: ['sol', 'solidity', 'Solidity'], - loader: () => _monaco.Promise.wrap(import('./solidity')) + loader: () => import('./solidity') }); diff --git a/src/sql/sql.contribution.ts b/src/sql/sql.contribution.ts index 629782f4..00b4a72e 100644 --- a/src/sql/sql.contribution.ts +++ b/src/sql/sql.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'sql', extensions: ['.sql'], aliases: ['SQL'], - loader: () => _monaco.Promise.wrap(import('./sql')) + loader: () => import('./sql') }); diff --git a/src/st/st.contribution.ts b/src/st/st.contribution.ts index 20a33b3f..05947174 100644 --- a/src/st/st.contribution.ts +++ b/src/st/st.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'st', extensions: ['.st', '.iecst', '.iecplc', '.lc3lib'], aliases: ['StructuredText', 'scl', 'stl'], - loader: () => _monaco.Promise.wrap(import('./st')) + loader: () => import('./st') }); diff --git a/src/swift/swift.contribution.ts b/src/swift/swift.contribution.ts index d6ffb098..2ce789f1 100644 --- a/src/swift/swift.contribution.ts +++ b/src/swift/swift.contribution.ts @@ -6,13 +6,10 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'swift', aliases: ['Swift', 'swift'], extensions: ['.swift'], mimetypes: ['text/swift'], - loader: () => _monaco.Promise.wrap(import('./swift')) + loader: () => import('./swift') }); diff --git a/src/typescript/typescript.contribution.ts b/src/typescript/typescript.contribution.ts index bc0483e2..f7c0dfc7 100644 --- a/src/typescript/typescript.contribution.ts +++ b/src/typescript/typescript.contribution.ts @@ -6,13 +6,10 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'typescript', extensions: ['.ts', '.tsx'], aliases: ['TypeScript', 'ts', 'typescript'], mimetypes: ['text/typescript'], - loader: () => _monaco.Promise.wrap(>import('./typescript')) + loader: () => >import('./typescript') }); diff --git a/src/vb/vb.contribution.ts b/src/vb/vb.contribution.ts index 744e2958..735d8cbd 100644 --- a/src/vb/vb.contribution.ts +++ b/src/vb/vb.contribution.ts @@ -6,12 +6,9 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'vb', extensions: ['.vb'], aliases: ['Visual Basic', 'vb'], - loader: () => _monaco.Promise.wrap(import('./vb')) + loader: () => import('./vb') }); diff --git a/src/xml/xml.contribution.ts b/src/xml/xml.contribution.ts index 35e8ad07..3208840e 100644 --- a/src/xml/xml.contribution.ts +++ b/src/xml/xml.contribution.ts @@ -6,14 +6,11 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'xml', extensions: ['.xml', '.dtd', '.ascx', '.csproj', '.config', '.wxi', '.wxl', '.wxs', '.xaml', '.svg', '.svgz'], firstLine: '(\\<\\?xml.*)|(\\ _monaco.Promise.wrap(import('./xml')) + loader: () => import('./xml') }); diff --git a/src/yaml/yaml.contribution.ts b/src/yaml/yaml.contribution.ts index 6d3c37a2..85f04171 100644 --- a/src/yaml/yaml.contribution.ts +++ b/src/yaml/yaml.contribution.ts @@ -6,13 +6,10 @@ import { registerLanguage } from '../_.contribution'; -// Allow for running under nodejs/requirejs in tests -const _monaco: typeof monaco = (typeof monaco === 'undefined' ? (self).monaco : monaco); - registerLanguage({ id: 'yaml', extensions: ['.yaml', '.yml'], aliases: ['YAML', 'yaml', 'YML', 'yml'], mimetypes: ['application/x-yaml'], - loader: () => _monaco.Promise.wrap(import('./yaml')) + loader: () => import('./yaml') });