From 699cae24be6cd3f6ad113816047ccd5b29dfb79b Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Wed, 8 Oct 2025 16:17:57 +0200 Subject: [PATCH] Removes unneeded filler redirection --- src/basic-languages/_.contribution.ts | 2 +- src/basic-languages/abap/abap.ts | 2 +- src/basic-languages/apex/apex.ts | 2 +- src/basic-languages/azcli/azcli.ts | 2 +- src/basic-languages/bat/bat.ts | 2 +- src/basic-languages/bicep/bicep.ts | 2 +- src/basic-languages/cameligo/cameligo.ts | 2 +- src/basic-languages/clojure/clojure.ts | 2 +- src/basic-languages/coffee/coffee.ts | 2 +- src/basic-languages/cpp/cpp.ts | 2 +- src/basic-languages/csharp/csharp.ts | 2 +- src/basic-languages/csp/csp.ts | 2 +- src/basic-languages/css/css.ts | 2 +- src/basic-languages/cypher/cypher.ts | 2 +- src/basic-languages/dart/dart.ts | 2 +- src/basic-languages/dockerfile/dockerfile.ts | 2 +- src/basic-languages/ecl/ecl.ts | 2 +- src/basic-languages/elixir/elixir.ts | 2 +- src/basic-languages/flow9/flow9.ts | 2 +- src/basic-languages/freemarker2/freemarker2.ts | 2 +- src/basic-languages/fsharp/fsharp.ts | 2 +- src/basic-languages/go/go.ts | 2 +- src/basic-languages/graphql/graphql.ts | 2 +- src/basic-languages/handlebars/handlebars.ts | 2 +- src/basic-languages/hcl/hcl.ts | 2 +- src/basic-languages/html/html.ts | 2 +- src/basic-languages/ini/ini.ts | 2 +- src/basic-languages/java/java.ts | 2 +- src/basic-languages/javascript/javascript.ts | 2 +- src/basic-languages/julia/julia.ts | 2 +- src/basic-languages/kotlin/kotlin.ts | 2 +- src/basic-languages/less/less.ts | 2 +- src/basic-languages/lexon/lexon.ts | 2 +- src/basic-languages/liquid/liquid.ts | 2 +- src/basic-languages/lua/lua.ts | 2 +- src/basic-languages/m3/m3.ts | 2 +- src/basic-languages/markdown/markdown.ts | 2 +- src/basic-languages/mdx/mdx.ts | 2 +- src/basic-languages/mips/mips.ts | 2 +- src/basic-languages/msdax/msdax.ts | 2 +- src/basic-languages/mysql/mysql.ts | 2 +- src/basic-languages/objective-c/objective-c.ts | 2 +- src/basic-languages/pascal/pascal.ts | 2 +- src/basic-languages/pascaligo/pascaligo.ts | 2 +- src/basic-languages/perl/perl.ts | 2 +- src/basic-languages/pgsql/pgsql.ts | 2 +- src/basic-languages/php/php.ts | 2 +- src/basic-languages/pla/pla.ts | 2 +- src/basic-languages/postiats/postiats.ts | 2 +- src/basic-languages/powerquery/powerquery.ts | 2 +- src/basic-languages/powershell/powershell.ts | 2 +- src/basic-languages/protobuf/protobuf.ts | 2 +- src/basic-languages/pug/pug.ts | 2 +- src/basic-languages/python/python.ts | 2 +- src/basic-languages/qsharp/qsharp.ts | 2 +- src/basic-languages/r/r.ts | 2 +- src/basic-languages/razor/razor.ts | 2 +- src/basic-languages/redis/redis.ts | 2 +- src/basic-languages/redshift/redshift.ts | 2 +- src/basic-languages/restructuredtext/restructuredtext.ts | 2 +- src/basic-languages/ruby/ruby.ts | 2 +- src/basic-languages/rust/rust.ts | 2 +- src/basic-languages/sb/sb.ts | 2 +- src/basic-languages/scala/scala.ts | 2 +- src/basic-languages/scheme/scheme.ts | 2 +- src/basic-languages/scss/scss.ts | 2 +- src/basic-languages/shell/shell.ts | 2 +- src/basic-languages/solidity/solidity.ts | 2 +- src/basic-languages/sophia/sophia.ts | 2 +- src/basic-languages/sql/sql.ts | 2 +- src/basic-languages/st/st.ts | 2 +- src/basic-languages/swift/swift.ts | 2 +- src/basic-languages/systemverilog/systemverilog.ts | 2 +- src/basic-languages/tcl/tcl.ts | 2 +- src/basic-languages/test/testRunner.ts | 2 +- src/basic-languages/twig/twig.ts | 2 +- src/basic-languages/typescript/typescript.ts | 2 +- src/basic-languages/typespec/typespec.ts | 2 +- src/basic-languages/vb/vb.ts | 2 +- src/basic-languages/wgsl/wgsl.ts | 2 +- src/basic-languages/xml/xml.ts | 2 +- src/basic-languages/yaml/yaml.ts | 2 +- src/common/workers.ts | 2 +- src/editor/editor.worker.ts | 2 +- src/fillers/editor.api.d.ts | 4 ---- src/fillers/monaco-editor-core.ts | 6 ------ src/language/common/lspLanguageFeatures.ts | 2 +- src/language/css/cssMode.ts | 2 +- src/language/css/cssWorker.ts | 2 +- src/language/css/monaco.contribution.ts | 2 +- src/language/css/workerManager.ts | 2 +- src/language/html/htmlMode.ts | 2 +- src/language/html/htmlWorker.ts | 2 +- src/language/html/monaco.contribution.ts | 2 +- src/language/html/workerManager.ts | 2 +- src/language/json/jsonMode.ts | 2 +- src/language/json/jsonWorker.ts | 2 +- src/language/json/monaco.contribution.ts | 2 +- src/language/json/tokenization.ts | 2 +- src/language/json/workerManager.ts | 2 +- src/language/typescript/languageFeatures.ts | 2 +- src/language/typescript/monaco.contribution.ts | 2 +- src/language/typescript/ts.worker.ts | 2 +- src/language/typescript/tsMode.ts | 2 +- src/language/typescript/tsWorker.ts | 2 +- src/language/typescript/workerManager.ts | 2 +- test/manual/dev-setup.js | 3 --- 107 files changed, 104 insertions(+), 117 deletions(-) delete mode 100644 src/fillers/editor.api.d.ts delete mode 100644 src/fillers/monaco-editor-core.ts diff --git a/src/basic-languages/_.contribution.ts b/src/basic-languages/_.contribution.ts index f0983d1c..4e9e09af 100644 --- a/src/basic-languages/_.contribution.ts +++ b/src/basic-languages/_.contribution.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { languages, editor } from '../fillers/monaco-editor-core'; +import { languages, editor } from 'monaco-editor-core'; interface ILang extends languages.ILanguageExtensionPoint { loader: () => Promise; diff --git a/src/basic-languages/abap/abap.ts b/src/basic-languages/abap/abap.ts index bdb5b61a..e5d66c94 100644 --- a/src/basic-languages/abap/abap.ts +++ b/src/basic-languages/abap/abap.ts @@ -14,7 +14,7 @@ * *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/apex/apex.ts b/src/basic-languages/apex/apex.ts index 502e11fb..2bb8d467 100644 --- a/src/basic-languages/apex/apex.ts +++ b/src/basic-languages/apex/apex.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { // the default separators except `@$` diff --git a/src/basic-languages/azcli/azcli.ts b/src/basic-languages/azcli/azcli.ts index 092e9b9f..cbfba350 100644 --- a/src/basic-languages/azcli/azcli.ts +++ b/src/basic-languages/azcli/azcli.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/bat/bat.ts b/src/basic-languages/bat/bat.ts index 36945583..3d1975d8 100644 --- a/src/basic-languages/bat/bat.ts +++ b/src/basic-languages/bat/bat.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/bicep/bicep.ts b/src/basic-languages/bicep/bicep.ts index f6769322..69cd8a7b 100644 --- a/src/basic-languages/bicep/bicep.ts +++ b/src/basic-languages/bicep/bicep.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; const bounded = (text: string) => `\\b${text}\\b`; diff --git a/src/basic-languages/cameligo/cameligo.ts b/src/basic-languages/cameligo/cameligo.ts index 9ec6b7b2..1be6401f 100644 --- a/src/basic-languages/cameligo/cameligo.ts +++ b/src/basic-languages/cameligo/cameligo.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/clojure/clojure.ts b/src/basic-languages/clojure/clojure.ts index 272ba3d8..c514c3c3 100644 --- a/src/basic-languages/clojure/clojure.ts +++ b/src/basic-languages/clojure/clojure.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/coffee/coffee.ts b/src/basic-languages/coffee/coffee.ts index ae219d51..0607df69 100644 --- a/src/basic-languages/coffee/coffee.ts +++ b/src/basic-languages/coffee/coffee.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { wordPattern: diff --git a/src/basic-languages/cpp/cpp.ts b/src/basic-languages/cpp/cpp.ts index 1dbffd45..c9b0a702 100644 --- a/src/basic-languages/cpp/cpp.ts +++ b/src/basic-languages/cpp/cpp.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/csharp/csharp.ts b/src/basic-languages/csharp/csharp.ts index 6f8e965e..9b08c7ed 100644 --- a/src/basic-languages/csharp/csharp.ts +++ b/src/basic-languages/csharp/csharp.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { wordPattern: diff --git a/src/basic-languages/csp/csp.ts b/src/basic-languages/csp/csp.ts index bbac8fab..21e61a38 100644 --- a/src/basic-languages/csp/csp.ts +++ b/src/basic-languages/csp/csp.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { brackets: [], diff --git a/src/basic-languages/css/css.ts b/src/basic-languages/css/css.ts index 5afc7af5..b7fb51ff 100644 --- a/src/basic-languages/css/css.ts +++ b/src/basic-languages/css/css.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { wordPattern: /(#?-?\d*\.\d\w*%?)|((::|[@#.!:])?[\w-?]+%?)|::|[@#.!:]/g, diff --git a/src/basic-languages/cypher/cypher.ts b/src/basic-languages/cypher/cypher.ts index c7901517..20c56d97 100644 --- a/src/basic-languages/cypher/cypher.ts +++ b/src/basic-languages/cypher/cypher.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { languages } from '../../fillers/monaco-editor-core'; +import { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/dart/dart.ts b/src/basic-languages/dart/dart.ts index bffea5f3..c977d8b9 100644 --- a/src/basic-languages/dart/dart.ts +++ b/src/basic-languages/dart/dart.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/dockerfile/dockerfile.ts b/src/basic-languages/dockerfile/dockerfile.ts index d655dce7..1865aaa9 100644 --- a/src/basic-languages/dockerfile/dockerfile.ts +++ b/src/basic-languages/dockerfile/dockerfile.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { brackets: [ diff --git a/src/basic-languages/ecl/ecl.ts b/src/basic-languages/ecl/ecl.ts index ab12908e..91e55ec6 100644 --- a/src/basic-languages/ecl/ecl.ts +++ b/src/basic-languages/ecl/ecl.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/elixir/elixir.ts b/src/basic-languages/elixir/elixir.ts index bb98e976..2dd4a437 100644 --- a/src/basic-languages/elixir/elixir.ts +++ b/src/basic-languages/elixir/elixir.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/flow9/flow9.ts b/src/basic-languages/flow9/flow9.ts index b7e38856..2bd4b8df 100644 --- a/src/basic-languages/flow9/flow9.ts +++ b/src/basic-languages/flow9/flow9.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/freemarker2/freemarker2.ts b/src/basic-languages/freemarker2/freemarker2.ts index abcfe4f9..0b4c0036 100644 --- a/src/basic-languages/freemarker2/freemarker2.ts +++ b/src/basic-languages/freemarker2/freemarker2.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { languages } from '../../fillers/monaco-editor-core'; +import { languages } from 'monaco-editor-core'; // Difficulty: "Black hole!" /* diff --git a/src/basic-languages/fsharp/fsharp.ts b/src/basic-languages/fsharp/fsharp.ts index b478d47b..d8def180 100644 --- a/src/basic-languages/fsharp/fsharp.ts +++ b/src/basic-languages/fsharp/fsharp.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/go/go.ts b/src/basic-languages/go/go.ts index 45db7b43..4f644957 100644 --- a/src/basic-languages/go/go.ts +++ b/src/basic-languages/go/go.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/graphql/graphql.ts b/src/basic-languages/graphql/graphql.ts index 10fca122..62ecc5fa 100644 --- a/src/basic-languages/graphql/graphql.ts +++ b/src/basic-languages/graphql/graphql.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/handlebars/handlebars.ts b/src/basic-languages/handlebars/handlebars.ts index 76488c12..07ccfe44 100644 --- a/src/basic-languages/handlebars/handlebars.ts +++ b/src/basic-languages/handlebars/handlebars.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { languages } from '../../fillers/monaco-editor-core'; +import { languages } from 'monaco-editor-core'; const EMPTY_ELEMENTS: string[] = [ 'area', diff --git a/src/basic-languages/hcl/hcl.ts b/src/basic-languages/hcl/hcl.ts index 62fa7ef1..fa3ec0c8 100644 --- a/src/basic-languages/hcl/hcl.ts +++ b/src/basic-languages/hcl/hcl.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/html/html.ts b/src/basic-languages/html/html.ts index f9ffed20..4456eaf5 100644 --- a/src/basic-languages/html/html.ts +++ b/src/basic-languages/html/html.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { languages } from '../../fillers/monaco-editor-core'; +import { languages } from 'monaco-editor-core'; const EMPTY_ELEMENTS: string[] = [ 'area', diff --git a/src/basic-languages/ini/ini.ts b/src/basic-languages/ini/ini.ts index c9b6486c..2cc01789 100644 --- a/src/basic-languages/ini/ini.ts +++ b/src/basic-languages/ini/ini.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/java/java.ts b/src/basic-languages/java/java.ts index 6ee26971..7ee78e84 100644 --- a/src/basic-languages/java/java.ts +++ b/src/basic-languages/java/java.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { // the default separators except `@$` diff --git a/src/basic-languages/javascript/javascript.ts b/src/basic-languages/javascript/javascript.ts index 3af6b4f8..9d5b85c6 100644 --- a/src/basic-languages/javascript/javascript.ts +++ b/src/basic-languages/javascript/javascript.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { conf as tsConf, language as tsLanguage } from '../typescript/typescript'; -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = tsConf; diff --git a/src/basic-languages/julia/julia.ts b/src/basic-languages/julia/julia.ts index 00b283cb..4816c110 100644 --- a/src/basic-languages/julia/julia.ts +++ b/src/basic-languages/julia/julia.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { brackets: [ diff --git a/src/basic-languages/kotlin/kotlin.ts b/src/basic-languages/kotlin/kotlin.ts index 233525b3..c16c7e69 100644 --- a/src/basic-languages/kotlin/kotlin.ts +++ b/src/basic-languages/kotlin/kotlin.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { // the default separators except `@$` diff --git a/src/basic-languages/less/less.ts b/src/basic-languages/less/less.ts index 4722c0e0..98fa7530 100644 --- a/src/basic-languages/less/less.ts +++ b/src/basic-languages/less/less.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { wordPattern: /(#?-?\d*\.\d\w*%?)|([@#!.:]?[\w-?]+%?)|[@#!.]/g, diff --git a/src/basic-languages/lexon/lexon.ts b/src/basic-languages/lexon/lexon.ts index 6f22624b..0475ab76 100644 --- a/src/basic-languages/lexon/lexon.ts +++ b/src/basic-languages/lexon/lexon.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/liquid/liquid.ts b/src/basic-languages/liquid/liquid.ts index fa434646..17ad671e 100644 --- a/src/basic-languages/liquid/liquid.ts +++ b/src/basic-languages/liquid/liquid.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { languages } from '../../fillers/monaco-editor-core'; +import { languages } from 'monaco-editor-core'; const EMPTY_ELEMENTS: string[] = [ 'area', diff --git a/src/basic-languages/lua/lua.ts b/src/basic-languages/lua/lua.ts index 8388f87b..0d443173 100644 --- a/src/basic-languages/lua/lua.ts +++ b/src/basic-languages/lua/lua.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/m3/m3.ts b/src/basic-languages/m3/m3.ts index 300c7a6d..f3f55353 100644 --- a/src/basic-languages/m3/m3.ts +++ b/src/basic-languages/m3/m3.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/markdown/markdown.ts b/src/basic-languages/markdown/markdown.ts index cd747fce..059f0417 100644 --- a/src/basic-languages/markdown/markdown.ts +++ b/src/basic-languages/markdown/markdown.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/mdx/mdx.ts b/src/basic-languages/mdx/mdx.ts index dfbc01e8..7045cbb5 100644 --- a/src/basic-languages/mdx/mdx.ts +++ b/src/basic-languages/mdx/mdx.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { languages } from '../../fillers/monaco-editor-core'; +import { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/mips/mips.ts b/src/basic-languages/mips/mips.ts index 37aa8ad5..06b46cda 100644 --- a/src/basic-languages/mips/mips.ts +++ b/src/basic-languages/mips/mips.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { wordPattern: diff --git a/src/basic-languages/msdax/msdax.ts b/src/basic-languages/msdax/msdax.ts index 8ab7f477..6b1f6841 100644 --- a/src/basic-languages/msdax/msdax.ts +++ b/src/basic-languages/msdax/msdax.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/mysql/mysql.ts b/src/basic-languages/mysql/mysql.ts index 1b943f17..5e60e6cf 100644 --- a/src/basic-languages/mysql/mysql.ts +++ b/src/basic-languages/mysql/mysql.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/objective-c/objective-c.ts b/src/basic-languages/objective-c/objective-c.ts index 37e282bb..e7e3e301 100644 --- a/src/basic-languages/objective-c/objective-c.ts +++ b/src/basic-languages/objective-c/objective-c.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/pascal/pascal.ts b/src/basic-languages/pascal/pascal.ts index e51f1ca0..e76dd81d 100644 --- a/src/basic-languages/pascal/pascal.ts +++ b/src/basic-languages/pascal/pascal.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { // the default separators except `@$` diff --git a/src/basic-languages/pascaligo/pascaligo.ts b/src/basic-languages/pascaligo/pascaligo.ts index 23f48e40..f0cff792 100644 --- a/src/basic-languages/pascaligo/pascaligo.ts +++ b/src/basic-languages/pascaligo/pascaligo.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/perl/perl.ts b/src/basic-languages/perl/perl.ts index 883d34ea..5ba3bd06 100644 --- a/src/basic-languages/perl/perl.ts +++ b/src/basic-languages/perl/perl.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/pgsql/pgsql.ts b/src/basic-languages/pgsql/pgsql.ts index 2eb663b4..00137b13 100644 --- a/src/basic-languages/pgsql/pgsql.ts +++ b/src/basic-languages/pgsql/pgsql.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/php/php.ts b/src/basic-languages/php/php.ts index cf32961b..2f10416c 100644 --- a/src/basic-languages/php/php.ts +++ b/src/basic-languages/php/php.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { wordPattern: diff --git a/src/basic-languages/pla/pla.ts b/src/basic-languages/pla/pla.ts index 11f521ac..b3e8f395 100644 --- a/src/basic-languages/pla/pla.ts +++ b/src/basic-languages/pla/pla.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/postiats/postiats.ts b/src/basic-languages/postiats/postiats.ts index 7b208b2a..db7a673b 100644 --- a/src/basic-languages/postiats/postiats.ts +++ b/src/basic-languages/postiats/postiats.ts @@ -5,7 +5,7 @@ * Based on the ATS/Postiats lexer by Hongwei Xi. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/powerquery/powerquery.ts b/src/basic-languages/powerquery/powerquery.ts index fb4db167..2f35178e 100644 --- a/src/basic-languages/powerquery/powerquery.ts +++ b/src/basic-languages/powerquery/powerquery.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/powershell/powershell.ts b/src/basic-languages/powershell/powershell.ts index 61d784bb..f5ee176a 100644 --- a/src/basic-languages/powershell/powershell.ts +++ b/src/basic-languages/powershell/powershell.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { // the default separators except `$-` diff --git a/src/basic-languages/protobuf/protobuf.ts b/src/basic-languages/protobuf/protobuf.ts index 09a48c6e..b0542bc5 100644 --- a/src/basic-languages/protobuf/protobuf.ts +++ b/src/basic-languages/protobuf/protobuf.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; const namedLiterals = ['true', 'false']; diff --git a/src/basic-languages/pug/pug.ts b/src/basic-languages/pug/pug.ts index f4b963f0..04c4970c 100644 --- a/src/basic-languages/pug/pug.ts +++ b/src/basic-languages/pug/pug.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/python/python.ts b/src/basic-languages/python/python.ts index a209212c..c48255a9 100644 --- a/src/basic-languages/python/python.ts +++ b/src/basic-languages/python/python.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { languages } from '../../fillers/monaco-editor-core'; +import { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/qsharp/qsharp.ts b/src/basic-languages/qsharp/qsharp.ts index 1c12de23..8cb42ae7 100644 --- a/src/basic-languages/qsharp/qsharp.ts +++ b/src/basic-languages/qsharp/qsharp.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/r/r.ts b/src/basic-languages/r/r.ts index c0111c67..1bbf0275 100644 --- a/src/basic-languages/r/r.ts +++ b/src/basic-languages/r/r.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/razor/razor.ts b/src/basic-languages/razor/razor.ts index 41afaac8..43dc9512 100644 --- a/src/basic-languages/razor/razor.ts +++ b/src/basic-languages/razor/razor.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { languages } from '../../fillers/monaco-editor-core'; +import { languages } from 'monaco-editor-core'; const EMPTY_ELEMENTS: string[] = [ 'area', diff --git a/src/basic-languages/redis/redis.ts b/src/basic-languages/redis/redis.ts index 0c5ed3aa..7fcf20f7 100644 --- a/src/basic-languages/redis/redis.ts +++ b/src/basic-languages/redis/redis.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { brackets: [ diff --git a/src/basic-languages/redshift/redshift.ts b/src/basic-languages/redshift/redshift.ts index fa66fccf..4f8d42aa 100644 --- a/src/basic-languages/redshift/redshift.ts +++ b/src/basic-languages/redshift/redshift.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/restructuredtext/restructuredtext.ts b/src/basic-languages/restructuredtext/restructuredtext.ts index fcfb24fa..184b76b8 100644 --- a/src/basic-languages/restructuredtext/restructuredtext.ts +++ b/src/basic-languages/restructuredtext/restructuredtext.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { brackets: [ diff --git a/src/basic-languages/ruby/ruby.ts b/src/basic-languages/ruby/ruby.ts index 8bf6925f..9b64fee3 100644 --- a/src/basic-languages/ruby/ruby.ts +++ b/src/basic-languages/ruby/ruby.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/rust/rust.ts b/src/basic-languages/rust/rust.ts index a3938476..384c0aae 100644 --- a/src/basic-languages/rust/rust.ts +++ b/src/basic-languages/rust/rust.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/sb/sb.ts b/src/basic-languages/sb/sb.ts index aa58bd99..1369d2f7 100644 --- a/src/basic-languages/sb/sb.ts +++ b/src/basic-languages/sb/sb.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/scala/scala.ts b/src/basic-languages/scala/scala.ts index 17f93ec2..3fefe718 100644 --- a/src/basic-languages/scala/scala.ts +++ b/src/basic-languages/scala/scala.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { /* diff --git a/src/basic-languages/scheme/scheme.ts b/src/basic-languages/scheme/scheme.ts index 0fb579cb..786bb179 100644 --- a/src/basic-languages/scheme/scheme.ts +++ b/src/basic-languages/scheme/scheme.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/scss/scss.ts b/src/basic-languages/scss/scss.ts index f7af50ee..b2c77906 100644 --- a/src/basic-languages/scss/scss.ts +++ b/src/basic-languages/scss/scss.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { wordPattern: /(#?-?\d*\.\d\w*%?)|([@$#!.:]?[\w-?]+%?)|[@#!.]/g, diff --git a/src/basic-languages/shell/shell.ts b/src/basic-languages/shell/shell.ts index 8c347d08..6c6c4ff8 100644 --- a/src/basic-languages/shell/shell.ts +++ b/src/basic-languages/shell/shell.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/solidity/solidity.ts b/src/basic-languages/solidity/solidity.ts index 2637e32f..02377b70 100644 --- a/src/basic-languages/solidity/solidity.ts +++ b/src/basic-languages/solidity/solidity.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/sophia/sophia.ts b/src/basic-languages/sophia/sophia.ts index 91df64be..35145329 100644 --- a/src/basic-languages/sophia/sophia.ts +++ b/src/basic-languages/sophia/sophia.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/sql/sql.ts b/src/basic-languages/sql/sql.ts index 05833633..89e13a3c 100644 --- a/src/basic-languages/sql/sql.ts +++ b/src/basic-languages/sql/sql.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/st/st.ts b/src/basic-languages/st/st.ts index 4ddfdfb7..58db492e 100644 --- a/src/basic-languages/st/st.ts +++ b/src/basic-languages/st/st.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/swift/swift.ts b/src/basic-languages/swift/swift.ts index 41512ab1..d8f6cbd8 100644 --- a/src/basic-languages/swift/swift.ts +++ b/src/basic-languages/swift/swift.ts @@ -2,7 +2,7 @@ * Copyright (C) David Owens II, owensd.io. All rights reserved. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/systemverilog/systemverilog.ts b/src/basic-languages/systemverilog/systemverilog.ts index 761f83d5..f6c97579 100644 --- a/src/basic-languages/systemverilog/systemverilog.ts +++ b/src/basic-languages/systemverilog/systemverilog.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/tcl/tcl.ts b/src/basic-languages/tcl/tcl.ts index 392b3cc4..5844c067 100644 --- a/src/basic-languages/tcl/tcl.ts +++ b/src/basic-languages/tcl/tcl.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { brackets: [ diff --git a/src/basic-languages/test/testRunner.ts b/src/basic-languages/test/testRunner.ts index 83ea33c7..87459710 100644 --- a/src/basic-languages/test/testRunner.ts +++ b/src/basic-languages/test/testRunner.ts @@ -6,7 +6,7 @@ import '../monaco.contribution'; import { loadLanguage } from '../_.contribution'; import * as assert from 'assert'; -import { editor } from '../../fillers/monaco-editor-core'; +import { editor } from 'monaco-editor-core'; export interface IRelaxedToken { startIndex: number; diff --git a/src/basic-languages/twig/twig.ts b/src/basic-languages/twig/twig.ts index 2dc7c42c..1dcaa612 100644 --- a/src/basic-languages/twig/twig.ts +++ b/src/basic-languages/twig/twig.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\$\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\s]+)/g, diff --git a/src/basic-languages/typescript/typescript.ts b/src/basic-languages/typescript/typescript.ts index 317a637f..d4e22f22 100644 --- a/src/basic-languages/typescript/typescript.ts +++ b/src/basic-languages/typescript/typescript.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { languages } from '../../fillers/monaco-editor-core'; +import { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { wordPattern: diff --git a/src/basic-languages/typespec/typespec.ts b/src/basic-languages/typespec/typespec.ts index d069e11c..bf0ab1ce 100644 --- a/src/basic-languages/typespec/typespec.ts +++ b/src/basic-languages/typespec/typespec.ts @@ -1,4 +1,4 @@ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; const bounded = (text: string) => `\\b${text}\\b`; const notBefore = (regex: string) => `(?!${regex})`; diff --git a/src/basic-languages/vb/vb.ts b/src/basic-languages/vb/vb.ts index 032ee6e6..ae0c2e41 100644 --- a/src/basic-languages/vb/vb.ts +++ b/src/basic-languages/vb/vb.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/wgsl/wgsl.ts b/src/basic-languages/wgsl/wgsl.ts index ab3a4822..db185d2d 100644 --- a/src/basic-languages/wgsl/wgsl.ts +++ b/src/basic-languages/wgsl/wgsl.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from '../../fillers/monaco-editor-core'; +import type { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/xml/xml.ts b/src/basic-languages/xml/xml.ts index 016fc57c..6ba7c7ea 100644 --- a/src/basic-languages/xml/xml.ts +++ b/src/basic-languages/xml/xml.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { languages } from '../../fillers/monaco-editor-core'; +import { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/yaml/yaml.ts b/src/basic-languages/yaml/yaml.ts index 5d187d14..49279e58 100644 --- a/src/basic-languages/yaml/yaml.ts +++ b/src/basic-languages/yaml/yaml.ts @@ -1,4 +1,4 @@ -import { languages } from '../../fillers/monaco-editor-core'; +import { languages } from 'monaco-editor-core'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/common/workers.ts b/src/common/workers.ts index 8e2ba824..2784b9f5 100644 --- a/src/common/workers.ts +++ b/src/common/workers.ts @@ -1,4 +1,4 @@ -import { editor } from '../fillers/monaco-editor-core'; +import { editor } from 'monaco-editor-core'; function createTrustedTypesPolicy( policyName: string, diff --git a/src/editor/editor.worker.ts b/src/editor/editor.worker.ts index dc3f26f1..42721139 100644 --- a/src/editor/editor.worker.ts +++ b/src/editor/editor.worker.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { initialize, isWorkerInitialized } from '../common/initialize'; +import { initialize, isWorkerInitialized } from '../common/initialize.js'; import * as worker from 'monaco-editor-core/esm/vs/editor/editor.worker.start'; // This is to preserve previous behavior. diff --git a/src/fillers/editor.api.d.ts b/src/fillers/editor.api.d.ts deleted file mode 100644 index 9404b2fc..00000000 --- a/src/fillers/editor.api.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -declare module 'vs/editor/editor.api' { - const x: any; - export = x; -} diff --git a/src/fillers/monaco-editor-core.ts b/src/fillers/monaco-editor-core.ts deleted file mode 100644 index cd996aa7..00000000 --- a/src/fillers/monaco-editor-core.ts +++ /dev/null @@ -1,6 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -export * from 'monaco-editor-core'; diff --git a/src/language/common/lspLanguageFeatures.ts b/src/language/common/lspLanguageFeatures.ts index 7197a2d2..cce2aff7 100644 --- a/src/language/common/lspLanguageFeatures.ts +++ b/src/language/common/lspLanguageFeatures.ts @@ -16,7 +16,7 @@ import { IDisposable, MarkerSeverity, IEvent -} from '../../fillers/monaco-editor-core'; +} from 'monaco-editor-core'; export interface WorkerAccessor { (...more: Uri[]): Promise; diff --git a/src/language/css/cssMode.ts b/src/language/css/cssMode.ts index 57301691..a3d562e1 100644 --- a/src/language/css/cssMode.ts +++ b/src/language/css/cssMode.ts @@ -7,7 +7,7 @@ import { WorkerManager } from './workerManager'; import type { CSSWorker } from './cssWorker'; import { LanguageServiceDefaults } from './monaco.contribution'; import * as languageFeatures from '../common/lspLanguageFeatures'; -import { Uri, IDisposable, languages } from '../../fillers/monaco-editor-core'; +import { Uri, IDisposable, languages } from 'monaco-editor-core'; export function setupMode(defaults: LanguageServiceDefaults): IDisposable { const disposables: IDisposable[] = []; diff --git a/src/language/css/cssWorker.ts b/src/language/css/cssWorker.ts index b0529192..60ffa97a 100644 --- a/src/language/css/cssWorker.ts +++ b/src/language/css/cssWorker.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { worker } from '../../fillers/monaco-editor-core'; +import type { worker } from 'monaco-editor-core'; import * as cssService from 'vscode-css-languageservice'; import { Options } from './monaco.contribution'; diff --git a/src/language/css/monaco.contribution.ts b/src/language/css/monaco.contribution.ts index 6b1d4e38..e935f86d 100644 --- a/src/language/css/monaco.contribution.ts +++ b/src/language/css/monaco.contribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as mode from './cssMode'; -import { languages, Emitter, IEvent } from '../../fillers/monaco-editor-core'; +import { languages, Emitter, IEvent } from 'monaco-editor-core'; export interface CSSFormatConfiguration { /** separate selectors with newline (e.g. "a,\nbr" or "a, br"): Default: true */ diff --git a/src/language/css/workerManager.ts b/src/language/css/workerManager.ts index 713ea9e3..00a472fe 100644 --- a/src/language/css/workerManager.ts +++ b/src/language/css/workerManager.ts @@ -5,7 +5,7 @@ import { LanguageServiceDefaults } from './monaco.contribution'; import type { CSSWorker } from './cssWorker'; -import { editor, IDisposable, Uri } from '../../fillers/monaco-editor-core'; +import { editor, IDisposable, Uri } from 'monaco-editor-core'; import { createWebWorker } from '../../common/workers'; const STOP_WHEN_IDLE_FOR = 2 * 60 * 1000; // 2min diff --git a/src/language/html/htmlMode.ts b/src/language/html/htmlMode.ts index 365118b2..9e07cdd5 100644 --- a/src/language/html/htmlMode.ts +++ b/src/language/html/htmlMode.ts @@ -7,7 +7,7 @@ import { WorkerManager } from './workerManager'; import type { HTMLWorker } from './htmlWorker'; import { LanguageServiceDefaults } from './monaco.contribution'; import * as languageFeatures from '../common/lspLanguageFeatures'; -import { Uri, IDisposable, languages } from '../../fillers/monaco-editor-core'; +import { Uri, IDisposable, languages } from 'monaco-editor-core'; class HTMLCompletionAdapter extends languageFeatures.CompletionAdapter { constructor(worker: languageFeatures.WorkerAccessor) { diff --git a/src/language/html/htmlWorker.ts b/src/language/html/htmlWorker.ts index 57113c05..c3979577 100644 --- a/src/language/html/htmlWorker.ts +++ b/src/language/html/htmlWorker.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { worker } from '../../fillers/monaco-editor-core'; +import { worker } from 'monaco-editor-core'; import * as htmlService from 'vscode-html-languageservice'; import type { Options } from './monaco.contribution'; import { IHTMLDataProvider } from 'vscode-html-languageservice'; diff --git a/src/language/html/monaco.contribution.ts b/src/language/html/monaco.contribution.ts index daed532c..7b3cbf65 100644 --- a/src/language/html/monaco.contribution.ts +++ b/src/language/html/monaco.contribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as mode from './htmlMode'; -import { languages, Emitter, IEvent, IDisposable } from '../../fillers/monaco-editor-core'; +import { languages, Emitter, IEvent, IDisposable } from 'monaco-editor-core'; export interface HTMLFormatConfiguration { readonly tabSize: number; diff --git a/src/language/html/workerManager.ts b/src/language/html/workerManager.ts index 8596d18b..a4c9cb04 100644 --- a/src/language/html/workerManager.ts +++ b/src/language/html/workerManager.ts @@ -5,7 +5,7 @@ import { LanguageServiceDefaults } from './monaco.contribution'; import type { HTMLWorker } from './htmlWorker'; -import { Uri, IDisposable, editor } from '../../fillers/monaco-editor-core'; +import { Uri, IDisposable, editor } from 'monaco-editor-core'; import { createWebWorker } from '../../common/workers'; const STOP_WHEN_IDLE_FOR = 2 * 60 * 1000; // 2min diff --git a/src/language/json/jsonMode.ts b/src/language/json/jsonMode.ts index d1345b2d..c7847883 100644 --- a/src/language/json/jsonMode.ts +++ b/src/language/json/jsonMode.ts @@ -8,7 +8,7 @@ import type { JSONWorker } from './jsonWorker'; import { LanguageServiceDefaults } from './monaco.contribution'; import * as languageFeatures from '../common/lspLanguageFeatures'; import { createTokenizationSupport } from './tokenization'; -import { Uri, IDisposable, languages, editor } from '../../fillers/monaco-editor-core'; +import { Uri, IDisposable, languages, editor } from 'monaco-editor-core'; let worker: languageFeatures.WorkerAccessor; diff --git a/src/language/json/jsonWorker.ts b/src/language/json/jsonWorker.ts index 138f40b9..247cc8eb 100644 --- a/src/language/json/jsonWorker.ts +++ b/src/language/json/jsonWorker.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as jsonService from 'vscode-json-languageservice'; -import type { worker } from '../../fillers/monaco-editor-core'; +import type { worker } from 'monaco-editor-core'; import { URI } from 'vscode-uri'; import { DiagnosticsOptions } from './monaco.contribution'; diff --git a/src/language/json/monaco.contribution.ts b/src/language/json/monaco.contribution.ts index 8b6f7110..ae44000f 100644 --- a/src/language/json/monaco.contribution.ts +++ b/src/language/json/monaco.contribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as mode from './jsonMode'; -import { Emitter, IEvent, languages, Uri } from '../../fillers/monaco-editor-core'; +import { Emitter, IEvent, languages, Uri } from 'monaco-editor-core'; // ---- JSON service types ---- export interface BaseASTNode { diff --git a/src/language/json/tokenization.ts b/src/language/json/tokenization.ts index f52c1511..25d4587c 100644 --- a/src/language/json/tokenization.ts +++ b/src/language/json/tokenization.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as json from 'jsonc-parser'; -import { languages } from '../../fillers/monaco-editor-core'; +import { languages } from 'monaco-editor-core'; export function createTokenizationSupport(supportComments: boolean): languages.TokensProvider { return { diff --git a/src/language/json/workerManager.ts b/src/language/json/workerManager.ts index 9eedbd0b..9af92e0d 100644 --- a/src/language/json/workerManager.ts +++ b/src/language/json/workerManager.ts @@ -5,7 +5,7 @@ import { LanguageServiceDefaults } from './monaco.contribution'; import type { JSONWorker } from './jsonWorker'; -import { IDisposable, Uri, editor } from '../../fillers/monaco-editor-core'; +import { IDisposable, Uri, editor } from 'monaco-editor-core'; import { createWebWorker } from '../../common/workers'; const STOP_WHEN_IDLE_FOR = 2 * 60 * 1000; // 2min diff --git a/src/language/typescript/languageFeatures.ts b/src/language/typescript/languageFeatures.ts index ca111417..37df03d2 100644 --- a/src/language/typescript/languageFeatures.ts +++ b/src/language/typescript/languageFeatures.ts @@ -23,7 +23,7 @@ import { IRange, MarkerTag, MarkerSeverity -} from '../../fillers/monaco-editor-core'; +} from 'monaco-editor-core'; //#region utils copied from typescript to prevent loading the entire typescriptServices --- diff --git a/src/language/typescript/monaco.contribution.ts b/src/language/typescript/monaco.contribution.ts index d272f375..163bb9f9 100644 --- a/src/language/typescript/monaco.contribution.ts +++ b/src/language/typescript/monaco.contribution.ts @@ -5,7 +5,7 @@ import type * as mode from './tsMode'; import { typescriptVersion as tsversion } from './lib/typescriptServicesMetadata'; // do not import the whole typescriptServices here -import { languages, Emitter, IEvent, IDisposable, Uri } from '../../fillers/monaco-editor-core'; +import { languages, Emitter, IEvent, IDisposable, Uri } from 'monaco-editor-core'; //#region enums copied from typescript to prevent loading the entire typescriptServices --- diff --git a/src/language/typescript/ts.worker.ts b/src/language/typescript/ts.worker.ts index d3536250..25d778d6 100644 --- a/src/language/typescript/ts.worker.ts +++ b/src/language/typescript/ts.worker.ts @@ -6,7 +6,7 @@ import { initialize } from '../../common/initialize'; import * as ts from './lib/typescriptServices'; import { ICreateData, TypeScriptWorker, create } from './tsWorker'; -import { worker } from '../../fillers/monaco-editor-core'; +import { worker } from 'monaco-editor-core'; import { libFileMap } from './lib/lib'; self.onmessage = () => { diff --git a/src/language/typescript/tsMode.ts b/src/language/typescript/tsMode.ts index 0f6d4d21..61e5a792 100644 --- a/src/language/typescript/tsMode.ts +++ b/src/language/typescript/tsMode.ts @@ -7,7 +7,7 @@ import { WorkerManager } from './workerManager'; import type { TypeScriptWorker } from './tsWorker'; import { LanguageServiceDefaults } from './monaco.contribution'; import * as languageFeatures from './languageFeatures'; -import { languages, IDisposable, Uri } from '../../fillers/monaco-editor-core'; +import { languages, IDisposable, Uri } from 'monaco-editor-core'; let javaScriptWorker: (...uris: Uri[]) => Promise; let typeScriptWorker: (...uris: Uri[]) => Promise; diff --git a/src/language/typescript/tsWorker.ts b/src/language/typescript/tsWorker.ts index c4f7d3eb..e2661a9d 100644 --- a/src/language/typescript/tsWorker.ts +++ b/src/language/typescript/tsWorker.ts @@ -12,7 +12,7 @@ import { IExtraLibs, TypeScriptWorker as ITypeScriptWorker } from './monaco.contribution'; -import { Uri, worker } from '../../fillers/monaco-editor-core'; +import { Uri, worker } from 'monaco-editor-core'; /** * Loading a default lib as a source file will mess up TS completely. diff --git a/src/language/typescript/workerManager.ts b/src/language/typescript/workerManager.ts index 2ae4f0ad..57ca7a8f 100644 --- a/src/language/typescript/workerManager.ts +++ b/src/language/typescript/workerManager.ts @@ -5,7 +5,7 @@ import { LanguageServiceDefaults } from './monaco.contribution'; import type { TypeScriptWorker } from './tsWorker'; -import { editor, Uri, IDisposable } from '../../fillers/monaco-editor-core'; +import { editor, Uri, IDisposable } from 'monaco-editor-core'; import { createWebWorker } from '../../common/workers'; export class WorkerManager { diff --git a/test/manual/dev-setup.js b/test/manual/dev-setup.js index 8eefd586..da8747c3 100644 --- a/test/manual/dev-setup.js +++ b/test/manual/dev-setup.js @@ -75,9 +75,6 @@ if (isRelease) { loaderPathsConfig['vs'] = `${PATH_PREFIX}${corePath}`; } else { - loaderPathsConfig[ - 'vs/fillers/monaco-editor-core' - ] = `${PATH_PREFIX}/monaco-editor/out/amd/fillers/monaco-editor-core-amd`; loaderPathsConfig['vs/language'] = `${PATH_PREFIX}${pluginPath}/language`; loaderPathsConfig['vs/basic-language'] = `${PATH_PREFIX}${pluginPath}/basic-language`; loaderPathsConfig['vs'] = `${PATH_PREFIX}${corePath}`;