From f534b2234ea992fde4c6981758cb782f8280d397 Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Fri, 19 Dec 2025 17:06:43 +0100 Subject: [PATCH] Exported modules reorganization --- build/amd/src/editor.main.ts | 11 +- build/esm/rollup-types.config.mjs | 14 +- build/esm/rollup.config.mjs | 20 +- build/shared.mjs | 53 ++++- samples/browser-esm-vite/main.ts | 14 +- samples/browser-esm-vite/package-lock.json | 211 ++++++++++++++---- samples/browser-esm-vite/package.json | 2 +- samples/browser-esm-vite/tsconfig.json | 15 +- src/basic-languages/monaco.contribution.ts | 86 ------- src/{editor/editor.api.ts => editor.ts} | 2 - src/editor/edcore.main.ts | 2 - src/editor/editor.all.ts | 3 - src/editor/editor.main.ts | 14 -- src/editor/editor.worker.ts | 20 -- src/editor/internal/editorWithLanguages.ts | 10 - src/editor/internal/initialize.ts | 12 - src/features/anchorSelect/register.d.ts | 1 + src/features/anchorSelect/register.js | 1 + src/features/bracketMatching/register.d.ts | 1 + src/features/bracketMatching/register.js | 1 + src/features/caretOperations/register.d.ts | 1 + src/features/caretOperations/register.js | 1 + src/features/clipboard/register.d.ts | 1 + src/features/clipboard/register.js | 1 + src/features/codeAction/register.d.ts | 1 + src/features/codeAction/register.js | 1 + src/features/codeEditor/register.d.ts | 1 + src/features/codeEditor/register.js | 1 + src/features/codelens/register.d.ts | 1 + src/features/codelens/register.js | 1 + src/features/codicon/register.d.ts | 1 + src/features/codicon/register.js | 1 + src/features/colorPicker/register.d.ts | 1 + src/features/colorPicker/register.js | 1 + src/features/comment/register.d.ts | 1 + src/features/comment/register.js | 1 + src/features/contextmenu/register.d.ts | 1 + src/features/contextmenu/register.js | 1 + src/features/cursorUndo/register.d.ts | 1 + src/features/cursorUndo/register.js | 1 + src/features/diffEditor/register.d.ts | 1 + src/features/diffEditor/register.js | 1 + .../diffEditorBreadcrumbs/register.d.ts | 1 + .../diffEditorBreadcrumbs/register.js | 1 + src/features/dnd/register.d.ts | 1 + src/features/dnd/register.js | 1 + src/features/documentSymbols/register.d.ts | 1 + src/features/documentSymbols/register.js | 1 + src/features/dropOrPasteInto/register.d.ts | 1 + src/features/dropOrPasteInto/register.js | 1 + src/features/find/register.d.ts | 1 + src/features/find/register.js | 1 + src/features/floatingMenu/register.d.ts | 1 + src/features/floatingMenu/register.js | 1 + src/features/folding/register.d.ts | 1 + src/features/folding/register.js | 1 + src/features/fontZoom/register.d.ts | 1 + src/features/fontZoom/register.js | 1 + src/features/format/register.d.ts | 1 + src/features/format/register.js | 1 + src/features/gotoError/register.d.ts | 1 + src/features/gotoError/register.js | 1 + src/features/gotoLine/register.d.ts | 1 + src/features/gotoLine/register.js | 1 + src/features/gotoSymbol/register.d.ts | 1 + src/features/gotoSymbol/register.js | 1 + src/features/gpu/register.d.ts | 1 + src/features/gpu/register.js | 1 + src/features/hover/register.d.ts | 1 + src/features/hover/register.js | 1 + src/features/iPadShowKeyboard/register.d.ts | 1 + src/features/iPadShowKeyboard/register.js | 1 + src/features/inPlaceReplace/register.d.ts | 1 + src/features/inPlaceReplace/register.js | 1 + src/features/indentation/register.d.ts | 1 + src/features/indentation/register.js | 1 + src/features/inlayHints/register.d.ts | 1 + src/features/inlayHints/register.js | 1 + src/features/inlineCompletions/register.d.ts | 1 + src/features/inlineCompletions/register.js | 1 + src/features/inlineProgress/register.d.ts | 1 + src/features/inlineProgress/register.js | 1 + src/features/insertFinalNewLine/register.d.ts | 1 + src/features/insertFinalNewLine/register.js | 1 + src/features/inspectTokens/register.d.ts | 1 + src/features/inspectTokens/register.js | 1 + src/features/lineSelection/register.d.ts | 1 + src/features/lineSelection/register.js | 1 + src/features/linesOperations/register.d.ts | 1 + src/features/linesOperations/register.js | 1 + src/features/linkedEditing/register.d.ts | 1 + src/features/linkedEditing/register.js | 1 + src/features/links/register.d.ts | 1 + src/features/links/register.js | 1 + src/features/longLinesHelper/register.d.ts | 1 + src/features/longLinesHelper/register.js | 1 + src/features/middleScroll/register.d.ts | 1 + src/features/middleScroll/register.js | 1 + src/features/multicursor/register.d.ts | 1 + src/features/multicursor/register.js | 1 + src/features/parameterHints/register.d.ts | 1 + src/features/parameterHints/register.js | 1 + src/features/placeholderText/register.d.ts | 1 + src/features/placeholderText/register.js | 1 + src/features/quickCommand/register.d.ts | 1 + src/features/quickCommand/register.js | 1 + src/features/quickHelp/register.d.ts | 1 + src/features/quickHelp/register.js | 1 + src/features/quickOutline/register.d.ts | 1 + src/features/quickOutline/register.js | 1 + src/features/readOnlyMessage/register.d.ts | 1 + src/features/readOnlyMessage/register.js | 1 + src/features/referenceSearch/register.d.ts | 1 + src/features/referenceSearch/register.js | 1 + src/features/register.all.ts | 65 ++++++ src/features/rename/register.d.ts | 1 + src/features/rename/register.js | 1 + src/features/sectionHeaders/register.d.ts | 1 + src/features/sectionHeaders/register.js | 1 + src/features/semanticTokens/register.d.ts | 1 + src/features/semanticTokens/register.js | 1 + src/features/smartSelect/register.d.ts | 1 + src/features/smartSelect/register.js | 1 + src/features/snippet/register.d.ts | 1 + src/features/snippet/register.js | 1 + src/features/stickyScroll/register.d.ts | 1 + src/features/stickyScroll/register.js | 1 + src/features/suggest/register.d.ts | 1 + src/features/suggest/register.js | 1 + src/features/toggleHighContrast/register.d.ts | 1 + src/features/toggleHighContrast/register.js | 1 + src/features/toggleTabFocusMode/register.d.ts | 1 + src/features/toggleTabFocusMode/register.js | 1 + src/features/tokenization/register.d.ts | 1 + src/features/tokenization/register.js | 1 + src/features/unicodeHighlighter/register.d.ts | 1 + src/features/unicodeHighlighter/register.js | 1 + .../unusualLineTerminators/register.d.ts | 1 + .../unusualLineTerminators/register.js | 1 + src/features/wordHighlighter/register.d.ts | 1 + src/features/wordHighlighter/register.js | 1 + src/features/wordOperations/register.d.ts | 1 + src/features/wordOperations/register.js | 1 + src/features/wordPartOperations/register.d.ts | 1 + src/features/wordPartOperations/register.js | 1 + src/index.ts | 9 + src/{ => internal}/common/initialize.ts | 0 src/{ => internal}/common/workers.ts | 0 .../definitions}/_.contribution.ts | 2 +- .../definitions}/abap/abap.test.ts | 0 .../definitions}/abap/abap.ts | 2 +- .../definitions/abap/register.ts} | 0 .../definitions}/apex/apex.test.ts | 0 .../definitions}/apex/apex.ts | 2 +- .../definitions/apex/register.ts} | 0 .../definitions}/azcli/azcli.test.ts | 0 .../definitions}/azcli/azcli.ts | 2 +- .../definitions/azcli/register.ts} | 0 .../definitions}/bat/bat.test.ts | 0 .../definitions}/bat/bat.ts | 2 +- .../definitions/bat/register.ts} | 0 .../definitions}/bicep/bicep.test.ts | 0 .../definitions}/bicep/bicep.ts | 2 +- .../definitions/bicep/register.ts} | 0 .../definitions}/cameligo/cameligo.test.ts | 0 .../definitions}/cameligo/cameligo.ts | 2 +- .../definitions/cameligo/register.ts} | 0 .../definitions}/clojure/clojure.test.ts | 0 .../definitions}/clojure/clojure.ts | 2 +- .../definitions/clojure/register.ts} | 0 .../definitions}/coffee/coffee.test.ts | 0 .../definitions}/coffee/coffee.ts | 2 +- .../definitions/coffee/register.ts} | 0 .../definitions}/cpp/cpp.test.ts | 0 .../definitions}/cpp/cpp.ts | 2 +- .../definitions/cpp/register.ts} | 0 .../definitions}/csharp/csharp.test.ts | 0 .../definitions}/csharp/csharp.ts | 2 +- .../definitions/csharp/register.ts} | 0 .../definitions}/csp/csp.test.ts | 0 .../definitions}/csp/csp.ts | 2 +- .../definitions/csp/register.ts} | 0 .../definitions}/css/css.test.ts | 0 .../definitions}/css/css.ts | 2 +- .../definitions/css/register.ts} | 0 .../definitions}/cypher/cypher.test.ts | 0 .../definitions}/cypher/cypher.ts | 2 +- .../definitions/cypher/register.ts} | 0 .../definitions}/dart/dart.test.ts | 0 .../definitions}/dart/dart.ts | 2 +- .../definitions/dart/register.ts} | 0 .../dockerfile/dockerfile.test.ts | 0 .../definitions}/dockerfile/dockerfile.ts | 2 +- .../definitions/dockerfile/register.ts} | 0 .../definitions}/ecl/ecl.test.ts | 0 .../definitions}/ecl/ecl.ts | 2 +- .../definitions/ecl/register.ts} | 0 .../definitions}/elixir/elixir.test.ts | 0 .../definitions}/elixir/elixir.ts | 2 +- .../definitions/elixir/register.ts} | 0 .../definitions}/flow9/flow9.test.ts | 0 .../definitions}/flow9/flow9.ts | 2 +- .../definitions/flow9/register.ts} | 0 .../freemarker2-angle-bracket.test.ts | 0 .../freemarker2-angle-dollar.test.ts | 0 .../freemarker2-auto-bracket.test.ts | 0 .../freemarker2-auto-dollar.test.ts | 0 .../freemarker2-bracket-bracket.test.ts | 0 .../freemarker2-bracket-dollar.test.ts | 0 .../definitions}/freemarker2/freemarker2.ts | 163 +++++++------- .../definitions/freemarker2/register.ts} | 0 .../definitions}/fsharp/fsharp.test.ts | 0 .../definitions}/fsharp/fsharp.ts | 2 +- .../definitions/fsharp/register.ts} | 0 .../definitions}/go/go.test.ts | 0 .../definitions}/go/go.ts | 2 +- .../definitions/go/register.ts} | 0 .../definitions}/graphql/graphql.test.ts | 0 .../definitions}/graphql/graphql.ts | 2 +- .../definitions/graphql/register.ts} | 0 .../handlebars/handlebars.test.ts | 0 .../definitions}/handlebars/handlebars.ts | 2 +- .../definitions/handlebars/register.ts} | 0 .../definitions}/hcl/hcl.test.ts | 0 .../definitions}/hcl/hcl.ts | 2 +- .../definitions/hcl/register.ts} | 0 .../definitions}/html/html.test.ts | 0 .../definitions}/html/html.ts | 2 +- .../definitions/html/register.ts} | 0 .../definitions}/ini/ini.ts | 2 +- .../definitions/ini/register.ts} | 0 .../definitions}/java/java.test.ts | 0 .../definitions}/java/java.ts | 2 +- .../definitions/java/register.ts} | 0 .../javascript/javascript.test.ts | 0 .../definitions}/javascript/javascript.ts | 2 +- .../definitions/javascript/register.ts} | 0 .../definitions}/julia/julia.test.ts | 0 .../definitions}/julia/julia.ts | 2 +- .../definitions/julia/register.ts} | 0 .../definitions}/kotlin/kotlin.test.ts | 0 .../definitions}/kotlin/kotlin.ts | 2 +- .../definitions/kotlin/register.ts} | 0 .../definitions}/less/less.test.ts | 0 .../definitions}/less/less.ts | 2 +- .../definitions/less/register.ts} | 0 .../definitions}/lexon/lexon.test.ts | 0 .../definitions}/lexon/lexon.ts | 2 +- .../definitions/lexon/register.ts} | 0 .../definitions}/liquid/liquid.test.ts | 0 .../definitions}/liquid/liquid.ts | 2 +- .../definitions/liquid/register.ts} | 0 .../definitions}/lua/lua.test.ts | 0 .../definitions}/lua/lua.ts | 2 +- .../definitions/lua/register.ts} | 0 .../definitions}/m3/m3.test.ts | 0 .../definitions}/m3/m3.ts | 2 +- .../definitions/m3/register.ts} | 0 .../definitions}/markdown/markdown.test.ts | 0 .../definitions}/markdown/markdown.ts | 2 +- .../definitions/markdown/register.ts} | 0 .../definitions}/mdx/mdx.test.ts | 0 .../definitions}/mdx/mdx.ts | 2 +- .../definitions/mdx/register.ts} | 0 .../definitions}/mips/mips.test.ts | 0 .../definitions}/mips/mips.ts | 2 +- .../definitions/mips/register.ts} | 0 .../definitions}/msdax/msdax.test.ts | 0 .../definitions}/msdax/msdax.ts | 2 +- .../definitions/msdax/register.ts} | 0 .../definitions}/mysql/keywords.js | 0 .../definitions}/mysql/keywords.mysql.txt | 0 .../definitions}/mysql/mysql.test.ts | 0 .../definitions}/mysql/mysql.ts | 2 +- .../definitions/mysql/register.ts} | 0 .../objective-c/objective-c.test.ts | 0 .../definitions}/objective-c/objective-c.ts | 2 +- .../definitions/objective-c/register.ts} | 0 .../definitions}/pascal/pascal.test.ts | 0 .../definitions}/pascal/pascal.ts | 2 +- .../definitions/pascal/register.ts} | 0 .../definitions}/pascaligo/pascaligo.test.ts | 0 .../definitions}/pascaligo/pascaligo.ts | 2 +- .../definitions/pascaligo/register.ts} | 0 .../definitions}/perl/perl.test.ts | 0 .../definitions}/perl/perl.ts | 2 +- .../definitions/perl/register.ts} | 0 .../definitions}/pgsql/keywords.js | 0 .../pgsql/keywords.postgresql.txt | 0 .../definitions}/pgsql/pgsql.test.ts | 0 .../definitions}/pgsql/pgsql.ts | 2 +- .../definitions/pgsql/register.ts} | 0 .../definitions}/php/php.test.ts | 0 .../definitions}/php/php.ts | 2 +- .../definitions/php/register.ts} | 0 .../definitions}/pla/pla.test.ts | 0 .../definitions}/pla/pla.ts | 2 +- .../definitions/pla/register.ts} | 0 .../definitions}/postiats/postiats.test.ts | 0 .../definitions}/postiats/postiats.ts | 2 +- .../definitions/postiats/register.ts} | 0 .../powerquery/powerquery.test.ts | 0 .../definitions}/powerquery/powerquery.ts | 2 +- .../definitions/powerquery/register.ts} | 0 .../powershell/powershell.test.ts | 0 .../definitions}/powershell/powershell.ts | 2 +- .../definitions/powershell/register.ts} | 0 .../definitions}/protobuf/protobuf.test.ts | 0 .../definitions}/protobuf/protobuf.ts | 2 +- .../definitions/protobuf/register.ts} | 0 .../definitions}/pug/pug.test.ts | 0 .../definitions}/pug/pug.ts | 2 +- .../definitions/pug/register.ts} | 0 .../definitions}/python/python.test.ts | 0 .../definitions}/python/python.ts | 2 +- .../definitions/python/register.ts} | 0 .../definitions}/qsharp/qsharp.test.ts | 0 .../definitions}/qsharp/qsharp.ts | 2 +- .../definitions/qsharp/register.ts} | 0 .../definitions}/r/r.test.ts | 0 .../definitions}/r/r.ts | 2 +- .../definitions/r/register.ts} | 0 .../definitions}/razor/razor.test.ts | 0 .../definitions}/razor/razor.ts | 2 +- .../definitions/razor/register.ts} | 0 .../definitions}/redis/redis.test.ts | 0 .../definitions}/redis/redis.ts | 2 +- .../definitions/redis/register.ts} | 0 .../definitions}/redshift/redshift.test.ts | 0 .../definitions}/redshift/redshift.ts | 2 +- .../definitions/redshift/register.ts} | 0 src/languages/definitions/register.all.ts | 87 ++++++++ .../definitions/restructuredtext/register.ts} | 0 .../restructuredtext/restructuredtext.test.ts | 0 .../restructuredtext/restructuredtext.ts | 2 +- .../definitions/ruby/register.ts} | 0 .../definitions}/ruby/ruby.test.ts | 0 .../definitions}/ruby/ruby.ts | 2 +- .../definitions/rust/register.ts} | 0 .../definitions}/rust/rust.test.ts | 0 .../definitions}/rust/rust.ts | 2 +- .../definitions/sb/register.ts} | 0 .../definitions}/sb/sb.test.ts | 0 .../definitions}/sb/sb.ts | 2 +- .../definitions/scala/register.ts} | 0 .../definitions}/scala/scala.test.ts | 0 .../definitions}/scala/scala.ts | 2 +- .../definitions/scheme/register.ts} | 0 .../definitions}/scheme/scheme.test.ts | 0 .../definitions}/scheme/scheme.ts | 2 +- .../definitions/scss/register.ts} | 0 .../definitions}/scss/scss.test.ts | 0 .../definitions}/scss/scss.ts | 2 +- .../definitions/shell/register.ts} | 0 .../definitions}/shell/shell.test.ts | 0 .../definitions}/shell/shell.ts | 2 +- .../definitions/solidity/register.ts} | 0 .../definitions}/solidity/solidity.test.ts | 0 .../definitions}/solidity/solidity.ts | 2 +- .../definitions/sophia/register.ts} | 0 .../definitions}/sophia/sophia.test.ts | 0 .../definitions}/sophia/sophia.ts | 2 +- .../definitions/sparql/register.ts} | 0 .../definitions}/sparql/sparql.test.ts | 0 .../definitions}/sparql/sparql.ts | 2 +- .../definitions}/sql/keywords.js | 0 .../definitions/sql/register.ts} | 0 .../definitions}/sql/sql.test.ts | 0 .../definitions}/sql/sql.ts | 2 +- .../definitions/st/register.ts} | 0 .../definitions}/st/st.test.ts | 0 .../definitions}/st/st.ts | 2 +- .../definitions/swift/register.ts} | 0 .../definitions}/swift/swift.test.ts | 0 .../definitions}/swift/swift.ts | 2 +- .../definitions/systemverilog/register.ts} | 0 .../systemverilog/systemverilog.test.ts | 0 .../systemverilog/systemverilog.ts | 2 +- .../definitions/tcl/register.ts} | 0 .../definitions}/tcl/tcl.test.ts | 0 .../definitions}/tcl/tcl.ts | 2 +- .../definitions}/test/testRunner.ts | 4 +- .../definitions/twig/register.ts} | 0 .../definitions}/twig/twig.test.ts | 0 .../definitions}/twig/twig.ts | 2 +- .../definitions/typescript/register.ts} | 0 .../typescript/typescript.test.ts | 0 .../definitions}/typescript/typescript.ts | 2 +- .../definitions/typespec/register.ts} | 0 .../definitions}/typespec/typespec.test.ts | 0 .../definitions}/typespec/typespec.ts | 2 +- .../definitions/vb/register.ts} | 0 .../definitions}/vb/vb.test.ts | 0 .../definitions}/vb/vb.ts | 2 +- .../definitions/wgsl/register.ts} | 0 .../definitions}/wgsl/wgsl.test.ts | 0 .../definitions}/wgsl/wgsl.ts | 2 +- .../definitions/xml/register.ts} | 0 .../definitions}/xml/xml.test.ts | 0 .../definitions}/xml/xml.ts | 2 +- .../definitions/yaml/register.ts} | 0 .../definitions}/yaml/yaml.test.ts | 0 .../definitions}/yaml/yaml.ts | 2 +- .../features}/common/lspLanguageFeatures.ts | 64 +++--- .../features}/css/css.worker.ts | 2 +- .../features}/css/cssMode.ts | 4 +- .../features}/css/cssWorker.ts | 4 +- .../features/css/register.ts} | 2 +- .../features}/css/workerManager.ts | 6 +- .../features}/html/html.worker.ts | 2 +- .../features}/html/htmlMode.ts | 4 +- .../features}/html/htmlWorker.ts | 4 +- .../features/html/register.ts} | 2 +- .../features}/html/workerManager.ts | 6 +- .../features}/json/json.worker.ts | 2 +- .../features}/json/jsonMode.ts | 4 +- .../features}/json/jsonWorker.ts | 4 +- .../features/json/register.ts} | 2 +- .../features}/json/tokenization.ts | 4 +- .../features}/json/workerManager.ts | 6 +- src/languages/features/register.all.ts | 6 + .../features}/typescript/languageFeatures.ts | 23 +- .../typescript/lib/editor.worker.d.ts | 0 .../features}/typescript/lib/lib.index.ts | 0 .../features}/typescript/lib/lib.ts | 0 .../typescript/lib/typescriptServices.d.ts | 0 .../typescript/lib/typescriptServices.js | 0 .../lib/typescriptServicesMetadata.ts | 0 .../features/typescript/register.ts} | 2 +- .../features}/typescript/ts.worker.ts | 4 +- .../features}/typescript/tsMode.ts | 4 +- .../features}/typescript/tsWorker.ts | 4 +- .../features}/typescript/workerManager.ts | 6 +- src/languages/register.all.ts | 2 + 434 files changed, 798 insertions(+), 482 deletions(-) delete mode 100644 src/basic-languages/monaco.contribution.ts rename src/{editor/editor.api.ts => editor.ts} (56%) delete mode 100644 src/editor/edcore.main.ts delete mode 100644 src/editor/editor.all.ts delete mode 100644 src/editor/editor.main.ts delete mode 100644 src/editor/editor.worker.ts delete mode 100644 src/editor/internal/editorWithLanguages.ts delete mode 100644 src/editor/internal/initialize.ts create mode 100644 src/features/anchorSelect/register.d.ts create mode 100644 src/features/anchorSelect/register.js create mode 100644 src/features/bracketMatching/register.d.ts create mode 100644 src/features/bracketMatching/register.js create mode 100644 src/features/caretOperations/register.d.ts create mode 100644 src/features/caretOperations/register.js create mode 100644 src/features/clipboard/register.d.ts create mode 100644 src/features/clipboard/register.js create mode 100644 src/features/codeAction/register.d.ts create mode 100644 src/features/codeAction/register.js create mode 100644 src/features/codeEditor/register.d.ts create mode 100644 src/features/codeEditor/register.js create mode 100644 src/features/codelens/register.d.ts create mode 100644 src/features/codelens/register.js create mode 100644 src/features/codicon/register.d.ts create mode 100644 src/features/codicon/register.js create mode 100644 src/features/colorPicker/register.d.ts create mode 100644 src/features/colorPicker/register.js create mode 100644 src/features/comment/register.d.ts create mode 100644 src/features/comment/register.js create mode 100644 src/features/contextmenu/register.d.ts create mode 100644 src/features/contextmenu/register.js create mode 100644 src/features/cursorUndo/register.d.ts create mode 100644 src/features/cursorUndo/register.js create mode 100644 src/features/diffEditor/register.d.ts create mode 100644 src/features/diffEditor/register.js create mode 100644 src/features/diffEditorBreadcrumbs/register.d.ts create mode 100644 src/features/diffEditorBreadcrumbs/register.js create mode 100644 src/features/dnd/register.d.ts create mode 100644 src/features/dnd/register.js create mode 100644 src/features/documentSymbols/register.d.ts create mode 100644 src/features/documentSymbols/register.js create mode 100644 src/features/dropOrPasteInto/register.d.ts create mode 100644 src/features/dropOrPasteInto/register.js create mode 100644 src/features/find/register.d.ts create mode 100644 src/features/find/register.js create mode 100644 src/features/floatingMenu/register.d.ts create mode 100644 src/features/floatingMenu/register.js create mode 100644 src/features/folding/register.d.ts create mode 100644 src/features/folding/register.js create mode 100644 src/features/fontZoom/register.d.ts create mode 100644 src/features/fontZoom/register.js create mode 100644 src/features/format/register.d.ts create mode 100644 src/features/format/register.js create mode 100644 src/features/gotoError/register.d.ts create mode 100644 src/features/gotoError/register.js create mode 100644 src/features/gotoLine/register.d.ts create mode 100644 src/features/gotoLine/register.js create mode 100644 src/features/gotoSymbol/register.d.ts create mode 100644 src/features/gotoSymbol/register.js create mode 100644 src/features/gpu/register.d.ts create mode 100644 src/features/gpu/register.js create mode 100644 src/features/hover/register.d.ts create mode 100644 src/features/hover/register.js create mode 100644 src/features/iPadShowKeyboard/register.d.ts create mode 100644 src/features/iPadShowKeyboard/register.js create mode 100644 src/features/inPlaceReplace/register.d.ts create mode 100644 src/features/inPlaceReplace/register.js create mode 100644 src/features/indentation/register.d.ts create mode 100644 src/features/indentation/register.js create mode 100644 src/features/inlayHints/register.d.ts create mode 100644 src/features/inlayHints/register.js create mode 100644 src/features/inlineCompletions/register.d.ts create mode 100644 src/features/inlineCompletions/register.js create mode 100644 src/features/inlineProgress/register.d.ts create mode 100644 src/features/inlineProgress/register.js create mode 100644 src/features/insertFinalNewLine/register.d.ts create mode 100644 src/features/insertFinalNewLine/register.js create mode 100644 src/features/inspectTokens/register.d.ts create mode 100644 src/features/inspectTokens/register.js create mode 100644 src/features/lineSelection/register.d.ts create mode 100644 src/features/lineSelection/register.js create mode 100644 src/features/linesOperations/register.d.ts create mode 100644 src/features/linesOperations/register.js create mode 100644 src/features/linkedEditing/register.d.ts create mode 100644 src/features/linkedEditing/register.js create mode 100644 src/features/links/register.d.ts create mode 100644 src/features/links/register.js create mode 100644 src/features/longLinesHelper/register.d.ts create mode 100644 src/features/longLinesHelper/register.js create mode 100644 src/features/middleScroll/register.d.ts create mode 100644 src/features/middleScroll/register.js create mode 100644 src/features/multicursor/register.d.ts create mode 100644 src/features/multicursor/register.js create mode 100644 src/features/parameterHints/register.d.ts create mode 100644 src/features/parameterHints/register.js create mode 100644 src/features/placeholderText/register.d.ts create mode 100644 src/features/placeholderText/register.js create mode 100644 src/features/quickCommand/register.d.ts create mode 100644 src/features/quickCommand/register.js create mode 100644 src/features/quickHelp/register.d.ts create mode 100644 src/features/quickHelp/register.js create mode 100644 src/features/quickOutline/register.d.ts create mode 100644 src/features/quickOutline/register.js create mode 100644 src/features/readOnlyMessage/register.d.ts create mode 100644 src/features/readOnlyMessage/register.js create mode 100644 src/features/referenceSearch/register.d.ts create mode 100644 src/features/referenceSearch/register.js create mode 100644 src/features/register.all.ts create mode 100644 src/features/rename/register.d.ts create mode 100644 src/features/rename/register.js create mode 100644 src/features/sectionHeaders/register.d.ts create mode 100644 src/features/sectionHeaders/register.js create mode 100644 src/features/semanticTokens/register.d.ts create mode 100644 src/features/semanticTokens/register.js create mode 100644 src/features/smartSelect/register.d.ts create mode 100644 src/features/smartSelect/register.js create mode 100644 src/features/snippet/register.d.ts create mode 100644 src/features/snippet/register.js create mode 100644 src/features/stickyScroll/register.d.ts create mode 100644 src/features/stickyScroll/register.js create mode 100644 src/features/suggest/register.d.ts create mode 100644 src/features/suggest/register.js create mode 100644 src/features/toggleHighContrast/register.d.ts create mode 100644 src/features/toggleHighContrast/register.js create mode 100644 src/features/toggleTabFocusMode/register.d.ts create mode 100644 src/features/toggleTabFocusMode/register.js create mode 100644 src/features/tokenization/register.d.ts create mode 100644 src/features/tokenization/register.js create mode 100644 src/features/unicodeHighlighter/register.d.ts create mode 100644 src/features/unicodeHighlighter/register.js create mode 100644 src/features/unusualLineTerminators/register.d.ts create mode 100644 src/features/unusualLineTerminators/register.js create mode 100644 src/features/wordHighlighter/register.d.ts create mode 100644 src/features/wordHighlighter/register.js create mode 100644 src/features/wordOperations/register.d.ts create mode 100644 src/features/wordOperations/register.js create mode 100644 src/features/wordPartOperations/register.d.ts create mode 100644 src/features/wordPartOperations/register.js create mode 100644 src/index.ts rename src/{ => internal}/common/initialize.ts (100%) rename src/{ => internal}/common/workers.ts (100%) rename src/{basic-languages => languages/definitions}/_.contribution.ts (97%) rename src/{basic-languages => languages/definitions}/abap/abap.test.ts (100%) rename src/{basic-languages => languages/definitions}/abap/abap.ts (99%) rename src/{basic-languages/abap/abap.contribution.ts => languages/definitions/abap/register.ts} (100%) rename src/{basic-languages => languages/definitions}/apex/apex.test.ts (100%) rename src/{basic-languages => languages/definitions}/apex/apex.ts (99%) rename src/{basic-languages/apex/apex.contribution.ts => languages/definitions/apex/register.ts} (100%) rename src/{basic-languages => languages/definitions}/azcli/azcli.test.ts (100%) rename src/{basic-languages => languages/definitions}/azcli/azcli.ts (96%) rename src/{basic-languages/azcli/azcli.contribution.ts => languages/definitions/azcli/register.ts} (100%) rename src/{basic-languages => languages/definitions}/bat/bat.test.ts (100%) rename src/{basic-languages => languages/definitions}/bat/bat.ts (98%) rename src/{basic-languages/bat/bat.contribution.ts => languages/definitions/bat/register.ts} (100%) rename src/{basic-languages => languages/definitions}/bicep/bicep.test.ts (100%) rename src/{basic-languages => languages/definitions}/bicep/bicep.ts (98%) rename src/{basic-languages/bicep/bicep.contribution.ts => languages/definitions/bicep/register.ts} (100%) rename src/{basic-languages => languages/definitions}/cameligo/cameligo.test.ts (100%) rename src/{basic-languages => languages/definitions}/cameligo/cameligo.ts (98%) rename src/{basic-languages/cameligo/cameligo.contribution.ts => languages/definitions/cameligo/register.ts} (100%) rename src/{basic-languages => languages/definitions}/clojure/clojure.test.ts (100%) rename src/{basic-languages => languages/definitions}/clojure/clojure.ts (99%) rename src/{basic-languages/clojure/clojure.contribution.ts => languages/definitions/clojure/register.ts} (100%) rename src/{basic-languages => languages/definitions}/coffee/coffee.test.ts (100%) rename src/{basic-languages => languages/definitions}/coffee/coffee.ts (99%) rename src/{basic-languages/coffee/coffee.contribution.ts => languages/definitions/coffee/register.ts} (100%) rename src/{basic-languages => languages/definitions}/cpp/cpp.test.ts (100%) rename src/{basic-languages => languages/definitions}/cpp/cpp.ts (99%) rename src/{basic-languages/cpp/cpp.contribution.ts => languages/definitions/cpp/register.ts} (100%) rename src/{basic-languages => languages/definitions}/csharp/csharp.test.ts (100%) rename src/{basic-languages => languages/definitions}/csharp/csharp.ts (99%) rename src/{basic-languages/csharp/csharp.contribution.ts => languages/definitions/csharp/register.ts} (100%) rename src/{basic-languages => languages/definitions}/csp/csp.test.ts (100%) rename src/{basic-languages => languages/definitions}/csp/csp.ts (97%) rename src/{basic-languages/csp/csp.contribution.ts => languages/definitions/csp/register.ts} (100%) rename src/{basic-languages => languages/definitions}/css/css.test.ts (100%) rename src/{basic-languages => languages/definitions}/css/css.ts (99%) rename src/{basic-languages/css/css.contribution.ts => languages/definitions/css/register.ts} (100%) rename src/{basic-languages => languages/definitions}/cypher/cypher.test.ts (100%) rename src/{basic-languages => languages/definitions}/cypher/cypher.ts (99%) rename src/{basic-languages/cypher/cypher.contribution.ts => languages/definitions/cypher/register.ts} (100%) rename src/{basic-languages => languages/definitions}/dart/dart.test.ts (100%) rename src/{basic-languages => languages/definitions}/dart/dart.ts (99%) rename src/{basic-languages/dart/dart.contribution.ts => languages/definitions/dart/register.ts} (100%) rename src/{basic-languages => languages/definitions}/dockerfile/dockerfile.test.ts (100%) rename src/{basic-languages => languages/definitions}/dockerfile/dockerfile.ts (98%) rename src/{basic-languages/dockerfile/dockerfile.contribution.ts => languages/definitions/dockerfile/register.ts} (100%) rename src/{basic-languages => languages/definitions}/ecl/ecl.test.ts (100%) rename src/{basic-languages => languages/definitions}/ecl/ecl.ts (99%) rename src/{basic-languages/ecl/ecl.contribution.ts => languages/definitions/ecl/register.ts} (100%) rename src/{basic-languages => languages/definitions}/elixir/elixir.test.ts (100%) rename src/{basic-languages => languages/definitions}/elixir/elixir.ts (99%) rename src/{basic-languages/elixir/elixir.contribution.ts => languages/definitions/elixir/register.ts} (100%) rename src/{basic-languages => languages/definitions}/flow9/flow9.test.ts (100%) rename src/{basic-languages => languages/definitions}/flow9/flow9.ts (98%) rename src/{basic-languages/flow9/flow9.contribution.ts => languages/definitions/flow9/register.ts} (100%) rename src/{basic-languages => languages/definitions}/freemarker2/freemarker2-angle-bracket.test.ts (100%) rename src/{basic-languages => languages/definitions}/freemarker2/freemarker2-angle-dollar.test.ts (100%) rename src/{basic-languages => languages/definitions}/freemarker2/freemarker2-auto-bracket.test.ts (100%) rename src/{basic-languages => languages/definitions}/freemarker2/freemarker2-auto-dollar.test.ts (100%) rename src/{basic-languages => languages/definitions}/freemarker2/freemarker2-bracket-bracket.test.ts (100%) rename src/{basic-languages => languages/definitions}/freemarker2/freemarker2-bracket-dollar.test.ts (100%) rename src/{basic-languages => languages/definitions}/freemarker2/freemarker2.ts (93%) rename src/{basic-languages/freemarker2/freemarker2.contribution.ts => languages/definitions/freemarker2/register.ts} (100%) rename src/{basic-languages => languages/definitions}/fsharp/fsharp.test.ts (100%) rename src/{basic-languages => languages/definitions}/fsharp/fsharp.ts (98%) rename src/{basic-languages/fsharp/fsharp.contribution.ts => languages/definitions/fsharp/register.ts} (100%) rename src/{basic-languages => languages/definitions}/go/go.test.ts (100%) rename src/{basic-languages => languages/definitions}/go/go.ts (98%) rename src/{basic-languages/go/go.contribution.ts => languages/definitions/go/register.ts} (100%) rename src/{basic-languages => languages/definitions}/graphql/graphql.test.ts (100%) rename src/{basic-languages => languages/definitions}/graphql/graphql.ts (98%) rename src/{basic-languages/graphql/graphql.contribution.ts => languages/definitions/graphql/register.ts} (100%) rename src/{basic-languages => languages/definitions}/handlebars/handlebars.test.ts (100%) rename src/{basic-languages => languages/definitions}/handlebars/handlebars.ts (99%) rename src/{basic-languages/handlebars/handlebars.contribution.ts => languages/definitions/handlebars/register.ts} (100%) rename src/{basic-languages => languages/definitions}/hcl/hcl.test.ts (100%) rename src/{basic-languages => languages/definitions}/hcl/hcl.ts (98%) rename src/{basic-languages/hcl/hcl.contribution.ts => languages/definitions/hcl/register.ts} (100%) rename src/{basic-languages => languages/definitions}/html/html.test.ts (100%) rename src/{basic-languages => languages/definitions}/html/html.ts (99%) rename src/{basic-languages/html/html.contribution.ts => languages/definitions/html/register.ts} (100%) rename src/{basic-languages => languages/definitions}/ini/ini.ts (97%) rename src/{basic-languages/ini/ini.contribution.ts => languages/definitions/ini/register.ts} (100%) rename src/{basic-languages => languages/definitions}/java/java.test.ts (100%) rename src/{basic-languages => languages/definitions}/java/java.ts (98%) rename src/{basic-languages/java/java.contribution.ts => languages/definitions/java/register.ts} (100%) rename src/{basic-languages => languages/definitions}/javascript/javascript.test.ts (100%) rename src/{basic-languages => languages/definitions}/javascript/javascript.ts (96%) rename src/{basic-languages/javascript/javascript.contribution.ts => languages/definitions/javascript/register.ts} (100%) rename src/{basic-languages => languages/definitions}/julia/julia.test.ts (100%) rename src/{basic-languages => languages/definitions}/julia/julia.ts (99%) rename src/{basic-languages/julia/julia.contribution.ts => languages/definitions/julia/register.ts} (100%) rename src/{basic-languages => languages/definitions}/kotlin/kotlin.test.ts (100%) rename src/{basic-languages => languages/definitions}/kotlin/kotlin.ts (98%) rename src/{basic-languages/kotlin/kotlin.contribution.ts => languages/definitions/kotlin/register.ts} (100%) rename src/{basic-languages => languages/definitions}/less/less.test.ts (100%) rename src/{basic-languages => languages/definitions}/less/less.ts (98%) rename src/{basic-languages/less/less.contribution.ts => languages/definitions/less/register.ts} (100%) rename src/{basic-languages => languages/definitions}/lexon/lexon.test.ts (100%) rename src/{basic-languages => languages/definitions}/lexon/lexon.ts (98%) rename src/{basic-languages/lexon/lexon.contribution.ts => languages/definitions/lexon/register.ts} (100%) rename src/{basic-languages => languages/definitions}/liquid/liquid.test.ts (100%) rename src/{basic-languages => languages/definitions}/liquid/liquid.ts (99%) rename src/{basic-languages/liquid/liquid.contribution.ts => languages/definitions/liquid/register.ts} (100%) rename src/{basic-languages => languages/definitions}/lua/lua.test.ts (100%) rename src/{basic-languages => languages/definitions}/lua/lua.ts (98%) rename src/{basic-languages/lua/lua.contribution.ts => languages/definitions/lua/register.ts} (100%) rename src/{basic-languages => languages/definitions}/m3/m3.test.ts (100%) rename src/{basic-languages => languages/definitions}/m3/m3.ts (98%) rename src/{basic-languages/m3/m3.contribution.ts => languages/definitions/m3/register.ts} (100%) rename src/{basic-languages => languages/definitions}/markdown/markdown.test.ts (100%) rename src/{basic-languages => languages/definitions}/markdown/markdown.ts (99%) rename src/{basic-languages/markdown/markdown.contribution.ts => languages/definitions/markdown/register.ts} (100%) rename src/{basic-languages => languages/definitions}/mdx/mdx.test.ts (100%) rename src/{basic-languages => languages/definitions}/mdx/mdx.ts (99%) rename src/{basic-languages/mdx/mdx.contribution.ts => languages/definitions/mdx/register.ts} (100%) rename src/{basic-languages => languages/definitions}/mips/mips.test.ts (100%) rename src/{basic-languages => languages/definitions}/mips/mips.ts (98%) rename src/{basic-languages/mips/mips.contribution.ts => languages/definitions/mips/register.ts} (100%) rename src/{basic-languages => languages/definitions}/msdax/msdax.test.ts (100%) rename src/{basic-languages => languages/definitions}/msdax/msdax.ts (99%) rename src/{basic-languages/msdax/msdax.contribution.ts => languages/definitions/msdax/register.ts} (100%) rename src/{basic-languages => languages/definitions}/mysql/keywords.js (100%) rename src/{basic-languages => languages/definitions}/mysql/keywords.mysql.txt (100%) rename src/{basic-languages => languages/definitions}/mysql/mysql.test.ts (100%) rename src/{basic-languages => languages/definitions}/mysql/mysql.ts (99%) rename src/{basic-languages/mysql/mysql.contribution.ts => languages/definitions/mysql/register.ts} (100%) rename src/{basic-languages => languages/definitions}/objective-c/objective-c.test.ts (100%) rename src/{basic-languages => languages/definitions}/objective-c/objective-c.ts (98%) rename src/{basic-languages/objective-c/objective-c.contribution.ts => languages/definitions/objective-c/register.ts} (100%) rename src/{basic-languages => languages/definitions}/pascal/pascal.test.ts (100%) rename src/{basic-languages => languages/definitions}/pascal/pascal.ts (98%) rename src/{basic-languages/pascal/pascal.contribution.ts => languages/definitions/pascal/register.ts} (100%) rename src/{basic-languages => languages/definitions}/pascaligo/pascaligo.test.ts (100%) rename src/{basic-languages => languages/definitions}/pascaligo/pascaligo.ts (98%) rename src/{basic-languages/pascaligo/pascaligo.contribution.ts => languages/definitions/pascaligo/register.ts} (100%) rename src/{basic-languages => languages/definitions}/perl/perl.test.ts (100%) rename src/{basic-languages => languages/definitions}/perl/perl.ts (99%) rename src/{basic-languages/perl/perl.contribution.ts => languages/definitions/perl/register.ts} (100%) rename src/{basic-languages => languages/definitions}/pgsql/keywords.js (100%) rename src/{basic-languages => languages/definitions}/pgsql/keywords.postgresql.txt (100%) rename src/{basic-languages => languages/definitions}/pgsql/pgsql.test.ts (100%) rename src/{basic-languages => languages/definitions}/pgsql/pgsql.ts (99%) rename src/{basic-languages/pgsql/pgsql.contribution.ts => languages/definitions/pgsql/register.ts} (100%) rename src/{basic-languages => languages/definitions}/php/php.test.ts (100%) rename src/{basic-languages => languages/definitions}/php/php.ts (99%) rename src/{basic-languages/php/php.contribution.ts => languages/definitions/php/register.ts} (100%) rename src/{basic-languages => languages/definitions}/pla/pla.test.ts (100%) rename src/{basic-languages => languages/definitions}/pla/pla.ts (98%) rename src/{basic-languages/pla/pla.contribution.ts => languages/definitions/pla/register.ts} (100%) rename src/{basic-languages => languages/definitions}/postiats/postiats.test.ts (100%) rename src/{basic-languages => languages/definitions}/postiats/postiats.ts (99%) rename src/{basic-languages/postiats/postiats.contribution.ts => languages/definitions/postiats/register.ts} (100%) rename src/{basic-languages => languages/definitions}/powerquery/powerquery.test.ts (100%) rename src/{basic-languages => languages/definitions}/powerquery/powerquery.ts (99%) rename src/{basic-languages/powerquery/powerquery.contribution.ts => languages/definitions/powerquery/register.ts} (100%) rename src/{basic-languages => languages/definitions}/powershell/powershell.test.ts (100%) rename src/{basic-languages => languages/definitions}/powershell/powershell.ts (98%) rename src/{basic-languages/powershell/powershell.contribution.ts => languages/definitions/powershell/register.ts} (100%) rename src/{basic-languages => languages/definitions}/protobuf/protobuf.test.ts (100%) rename src/{basic-languages => languages/definitions}/protobuf/protobuf.ts (99%) rename src/{basic-languages/protobuf/protobuf.contribution.ts => languages/definitions/protobuf/register.ts} (100%) rename src/{basic-languages => languages/definitions}/pug/pug.test.ts (100%) rename src/{basic-languages => languages/definitions}/pug/pug.ts (99%) rename src/{basic-languages/pug/pug.contribution.ts => languages/definitions/pug/register.ts} (100%) rename src/{basic-languages => languages/definitions}/python/python.test.ts (100%) rename src/{basic-languages => languages/definitions}/python/python.ts (99%) rename src/{basic-languages/python/python.contribution.ts => languages/definitions/python/register.ts} (100%) rename src/{basic-languages => languages/definitions}/qsharp/qsharp.test.ts (100%) rename src/{basic-languages => languages/definitions}/qsharp/qsharp.ts (98%) rename src/{basic-languages/qsharp/qsharp.contribution.ts => languages/definitions/qsharp/register.ts} (100%) rename src/{basic-languages => languages/definitions}/r/r.test.ts (100%) rename src/{basic-languages => languages/definitions}/r/r.ts (98%) rename src/{basic-languages/r/r.contribution.ts => languages/definitions/r/register.ts} (100%) rename src/{basic-languages => languages/definitions}/razor/razor.test.ts (100%) rename src/{basic-languages => languages/definitions}/razor/razor.ts (99%) rename src/{basic-languages/razor/razor.contribution.ts => languages/definitions/razor/register.ts} (100%) rename src/{basic-languages => languages/definitions}/redis/redis.test.ts (100%) rename src/{basic-languages => languages/definitions}/redis/redis.ts (98%) rename src/{basic-languages/redis/redis.contribution.ts => languages/definitions/redis/register.ts} (100%) rename src/{basic-languages => languages/definitions}/redshift/redshift.test.ts (100%) rename src/{basic-languages => languages/definitions}/redshift/redshift.ts (99%) rename src/{basic-languages/redshift/redshift.contribution.ts => languages/definitions/redshift/register.ts} (100%) create mode 100644 src/languages/definitions/register.all.ts rename src/{basic-languages/restructuredtext/restructuredtext.contribution.ts => languages/definitions/restructuredtext/register.ts} (100%) rename src/{basic-languages => languages/definitions}/restructuredtext/restructuredtext.test.ts (100%) rename src/{basic-languages => languages/definitions}/restructuredtext/restructuredtext.ts (99%) rename src/{basic-languages/ruby/ruby.contribution.ts => languages/definitions/ruby/register.ts} (100%) rename src/{basic-languages => languages/definitions}/ruby/ruby.test.ts (100%) rename src/{basic-languages => languages/definitions}/ruby/ruby.ts (99%) rename src/{basic-languages/rust/rust.contribution.ts => languages/definitions/rust/register.ts} (100%) rename src/{basic-languages => languages/definitions}/rust/rust.test.ts (100%) rename src/{basic-languages => languages/definitions}/rust/rust.ts (99%) rename src/{basic-languages/sb/sb.contribution.ts => languages/definitions/sb/register.ts} (100%) rename src/{basic-languages => languages/definitions}/sb/sb.test.ts (100%) rename src/{basic-languages => languages/definitions}/sb/sb.ts (98%) rename src/{basic-languages/scala/scala.contribution.ts => languages/definitions/scala/register.ts} (100%) rename src/{basic-languages => languages/definitions}/scala/scala.test.ts (100%) rename src/{basic-languages => languages/definitions}/scala/scala.ts (99%) rename src/{basic-languages/scheme/scheme.contribution.ts => languages/definitions/scheme/register.ts} (100%) rename src/{basic-languages => languages/definitions}/scheme/scheme.test.ts (100%) rename src/{basic-languages => languages/definitions}/scheme/scheme.ts (97%) rename src/{basic-languages/scss/scss.contribution.ts => languages/definitions/scss/register.ts} (100%) rename src/{basic-languages => languages/definitions}/scss/scss.test.ts (100%) rename src/{basic-languages => languages/definitions}/scss/scss.ts (99%) rename src/{basic-languages/shell/shell.contribution.ts => languages/definitions/shell/register.ts} (100%) rename src/{basic-languages => languages/definitions}/shell/shell.test.ts (100%) rename src/{basic-languages => languages/definitions}/shell/shell.ts (98%) rename src/{basic-languages/solidity/solidity.contribution.ts => languages/definitions/solidity/register.ts} (100%) rename src/{basic-languages => languages/definitions}/solidity/solidity.test.ts (100%) rename src/{basic-languages => languages/definitions}/solidity/solidity.ts (99%) rename src/{basic-languages/sophia/sophia.contribution.ts => languages/definitions/sophia/register.ts} (100%) rename src/{basic-languages => languages/definitions}/sophia/sophia.test.ts (100%) rename src/{basic-languages => languages/definitions}/sophia/sophia.ts (98%) rename src/{basic-languages/sparql/sparql.contribution.ts => languages/definitions/sparql/register.ts} (100%) rename src/{basic-languages => languages/definitions}/sparql/sparql.test.ts (100%) rename src/{basic-languages => languages/definitions}/sparql/sparql.ts (98%) rename src/{basic-languages => languages/definitions}/sql/keywords.js (100%) rename src/{basic-languages/sql/sql.contribution.ts => languages/definitions/sql/register.ts} (100%) rename src/{basic-languages => languages/definitions}/sql/sql.test.ts (100%) rename src/{basic-languages => languages/definitions}/sql/sql.ts (99%) rename src/{basic-languages/st/st.contribution.ts => languages/definitions/st/register.ts} (100%) rename src/{basic-languages => languages/definitions}/st/st.test.ts (100%) rename src/{basic-languages => languages/definitions}/st/st.ts (99%) rename src/{basic-languages/swift/swift.contribution.ts => languages/definitions/swift/register.ts} (100%) rename src/{basic-languages => languages/definitions}/swift/swift.test.ts (100%) rename src/{basic-languages => languages/definitions}/swift/swift.ts (99%) rename src/{basic-languages/systemverilog/systemverilog.contribution.ts => languages/definitions/systemverilog/register.ts} (100%) rename src/{basic-languages => languages/definitions}/systemverilog/systemverilog.test.ts (100%) rename src/{basic-languages => languages/definitions}/systemverilog/systemverilog.ts (99%) rename src/{basic-languages/tcl/tcl.contribution.ts => languages/definitions/tcl/register.ts} (100%) rename src/{basic-languages => languages/definitions}/tcl/tcl.test.ts (100%) rename src/{basic-languages => languages/definitions}/tcl/tcl.ts (98%) rename src/{basic-languages => languages/definitions}/test/testRunner.ts (95%) rename src/{basic-languages/twig/twig.contribution.ts => languages/definitions/twig/register.ts} (100%) rename src/{basic-languages => languages/definitions}/twig/twig.test.ts (100%) rename src/{basic-languages => languages/definitions}/twig/twig.ts (99%) rename src/{basic-languages/typescript/typescript.contribution.ts => languages/definitions/typescript/register.ts} (100%) rename src/{basic-languages => languages/definitions}/typescript/typescript.test.ts (100%) rename src/{basic-languages => languages/definitions}/typescript/typescript.ts (99%) rename src/{basic-languages/typespec/typespec.contribution.ts => languages/definitions/typespec/register.ts} (100%) rename src/{basic-languages => languages/definitions}/typespec/typespec.test.ts (100%) rename src/{basic-languages => languages/definitions}/typespec/typespec.ts (98%) rename src/{basic-languages/vb/vb.contribution.ts => languages/definitions/vb/register.ts} (100%) rename src/{basic-languages => languages/definitions}/vb/vb.test.ts (100%) rename src/{basic-languages => languages/definitions}/vb/vb.ts (99%) rename src/{basic-languages/wgsl/wgsl.contribution.ts => languages/definitions/wgsl/register.ts} (100%) rename src/{basic-languages => languages/definitions}/wgsl/wgsl.test.ts (100%) rename src/{basic-languages => languages/definitions}/wgsl/wgsl.ts (99%) rename src/{basic-languages/xml/xml.contribution.ts => languages/definitions/xml/register.ts} (100%) rename src/{basic-languages => languages/definitions}/xml/xml.test.ts (100%) rename src/{basic-languages => languages/definitions}/xml/xml.ts (98%) rename src/{basic-languages/yaml/yaml.contribution.ts => languages/definitions/yaml/register.ts} (100%) rename src/{basic-languages => languages/definitions}/yaml/yaml.test.ts (100%) rename src/{basic-languages => languages/definitions}/yaml/yaml.ts (99%) rename src/{language => languages/features}/common/lspLanguageFeatures.ts (95%) rename src/{language => languages/features}/css/css.worker.ts (88%) rename src/{language => languages/features}/css/cssMode.ts (96%) rename src/{language => languages/features}/css/cssWorker.ts (98%) rename src/{language/css/monaco.contribution.ts => languages/features/css/register.ts} (99%) rename src/{language => languages/features}/css/workerManager.ts (93%) rename src/{language => languages/features}/html/html.worker.ts (89%) rename src/{language => languages/features}/html/htmlMode.ts (97%) rename src/{language => languages/features}/html/htmlWorker.ts (98%) rename src/{language/html/monaco.contribution.ts => languages/features/html/register.ts} (99%) rename src/{language => languages/features}/html/workerManager.ts (93%) rename src/{language => languages/features}/json/json.worker.ts (89%) rename src/{language => languages/features}/json/jsonMode.ts (97%) rename src/{language => languages/features}/json/jsonWorker.ts (98%) rename src/{language/json/monaco.contribution.ts => languages/features/json/register.ts} (99%) rename src/{language => languages/features}/json/tokenization.ts (98%) rename src/{language => languages/features}/json/workerManager.ts (93%) create mode 100644 src/languages/features/register.all.ts rename src/{language => languages/features}/typescript/languageFeatures.ts (98%) rename src/{language => languages/features}/typescript/lib/editor.worker.d.ts (100%) rename src/{language => languages/features}/typescript/lib/lib.index.ts (100%) rename src/{language => languages/features}/typescript/lib/lib.ts (100%) rename src/{language => languages/features}/typescript/lib/typescriptServices.d.ts (100%) rename src/{language => languages/features}/typescript/lib/typescriptServices.js (100%) rename src/{language => languages/features}/typescript/lib/typescriptServicesMetadata.ts (100%) rename src/{language/typescript/monaco.contribution.ts => languages/features/typescript/register.ts} (99%) rename src/{language => languages/features}/typescript/ts.worker.ts (87%) rename src/{language => languages/features}/typescript/tsMode.ts (97%) rename src/{language => languages/features}/typescript/tsWorker.ts (99%) rename src/{language => languages/features}/typescript/workerManager.ts (94%) create mode 100644 src/languages/register.all.ts diff --git a/build/amd/src/editor.main.ts b/build/amd/src/editor.main.ts index 32783bfa..3bc892ba 100644 --- a/build/amd/src/editor.main.ts +++ b/build/amd/src/editor.main.ts @@ -81,11 +81,18 @@ function getWorkerBootstrapUrl(workerScriptUrl: string | URL) { } import 'vs/nls.messages-loader!'; -import * as monaco from '../../../src/editor/editor.main'; -export * from '../../../src/editor/editor.main'; +import * as monaco from '../../../src/index'; +export * from '../../../src/index'; globalThis.monaco = monaco; +const lang = monaco.languages as any; +lang.css = monaco.css; +lang.html = monaco.html; +lang.typescript = monaco.typescript; +lang.json = monaco.json; + + const styleSheetUrl = require.toUrl('vs/editor/editor.main.css'); const link = document.createElement('link'); diff --git a/build/esm/rollup-types.config.mjs b/build/esm/rollup-types.config.mjs index 5043188b..70d3b5ce 100644 --- a/build/esm/rollup-types.config.mjs +++ b/build/esm/rollup-types.config.mjs @@ -9,26 +9,32 @@ import nodeResolve from '@rollup/plugin-node-resolve'; import { join } from 'path'; import { defineConfig } from 'rollup'; import { dts } from "rollup-plugin-dts"; -import { dtsDeprecationWarning, mapModuleId } from '../shared.mjs'; +import { dtsDeprecationWarning, getAdditionalEntryPoints, mapModuleId } from '../shared.mjs'; const root = join(import.meta.dirname, '../../'); export default defineConfig({ input: { - entry: join(root, './src/editor/editor.main.ts'), - editorApi: join(root, './src/editor/editor.api.ts'), + entry: join(root, './src/index.ts'), + editor: join(root, './src/editor.ts'), + ...getAdditionalEntryPoints(), + //editorApi: join(root, './src/editor/editor.api.ts'), }, output: { dir: join(root, './out/monaco-editor/esm'), format: 'es', - preserveModules: false, + preserveModules: true, entryFileNames: function (chunkInfo) { const moduleId = chunkInfo.facadeModuleId; if (moduleId) { const m = mapModuleId(moduleId, '.d.ts'); + console.log(moduleId + ' => ' + m); if (m !== undefined) { + return m; } + } else { + console.warn('NO MODULE ID for chunkInfo', chunkInfo); } return '[name].d.ts'; }, diff --git a/build/esm/rollup.config.mjs b/build/esm/rollup.config.mjs index 37b08bd5..196dc3fc 100644 --- a/build/esm/rollup.config.mjs +++ b/build/esm/rollup.config.mjs @@ -13,7 +13,7 @@ import del from 'rollup-plugin-delete'; import keepCssImports from './rollup-plugin-keep-css-imports/dist/index.mjs'; import nodeResolve from '@rollup/plugin-node-resolve'; import { urlToEsmPlugin } from './rollup-url-to-module-plugin/index.mjs'; -import { getNlsEntryPoints, mapModuleId } from '../shared.mjs'; +import { getAdditionalEntryPoints, getAdditionalFiles, mapModuleId } from '../shared.mjs'; import { readFileSync } from 'fs'; @@ -22,12 +22,8 @@ const outDir = join(root, './out/monaco-editor/esm'); export default defineConfig({ input: { - entry: join(root, './src/editor/editor.main.ts'), - editorAll: join(root, './src/editor/editor.all.ts'), - edcoreMain: join(root, './src/editor/edcore.main.ts'), - editorApi: join(root, './src/editor/editor.api.ts'), - editorWorker: join(root, './src/editor/editor.worker.ts'), - ...getNlsEntryPoints(), + entry: join(root, './src/index.ts'), + ...getAdditionalEntryPoints(), }, output: { @@ -45,6 +41,7 @@ export default defineConfig({ return '[name].js'; }, preserveModules: true, + hoistTransitiveImports: false, }, @@ -52,13 +49,20 @@ export default defineConfig({ del({ targets: outDir, force: true }), { - name: 'copy-codicon-font', + name: 'emit-additional-files', generateBundle() { this.emitFile({ type: 'asset', fileName: 'vs/base/browser/ui/codicons/codicon/codicon.ttf', source: readFileSync(join(root, 'node_modules/monaco-editor-core/esm/vs/base/browser/ui/codicons/codicon/codicon.ttf')) }); + for (const file of getAdditionalFiles()) { + this.emitFile({ + type: 'asset', + fileName: file.pathFromRoot, + source: 'value' in file.source ? file.source.value : readFileSync(file.source.absolutePath) + }); + } } }, diff --git a/build/shared.mjs b/build/shared.mjs index dc471455..09a93dc6 100644 --- a/build/shared.mjs +++ b/build/shared.mjs @@ -8,12 +8,16 @@ import { dirname, join } from 'path'; import { fileURLToPath } from 'url'; import { readdirSync } from 'fs'; +import glob from 'glob'; /** * @param {string} filePath * @param {string} newExt */ export function changeExt(filePath, newExt) { + if (filePath.endsWith(newExt)) { + return filePath; + } const idx = filePath.lastIndexOf('.'); if (idx === -1) { return filePath + newExt; @@ -22,20 +26,49 @@ export function changeExt(filePath, newExt) { } } -export function getNlsEntryPoints() { +/** + * @returns {{ pathFromRoot: string, source: { value: string } | { absolutePath: string } }[]} + */ +export function getAdditionalFiles() { const nlsDir = dirname(fileURLToPath(import.meta.resolve('monaco-editor-core/esm/nls.messages.en.js'))); - const nlsFiles = readdirSync(nlsDir) - .filter(file => file.startsWith('nls.messages.') && file.endsWith('.js')) - .reduce((acc, file) => { - // @ts-ignore - acc[file] = join(nlsDir, file); - return acc; - }, {}); - return nlsFiles; + return readdirSync(nlsDir) + .flatMap(file => { + const match = /nls\.messages\.(?.+)\.js/.exec(file); + if (!match) { + return []; + } + const lang = match.groups?.lang; + return [ + { + pathFromRoot: join('vs', 'nls', 'lang', lang + '.js'), + source: { absolutePath: join(nlsDir, file) } + }, + { + pathFromRoot: join('vs', 'nls', 'lang', lang + '.d.ts'), + source: { value: 'export {};' } + } + ]; + }); } const root = join(import.meta.dirname, '../'); +/** + * @param {string} pattern + * @returns + */ +function findFiles(pattern) { + return glob.sync(pattern, { cwd: root }); +} + +export function getAdditionalEntryPoints() { + const features = Object.fromEntries(findFiles('./src/**/register.*').filter(p => !p.includes('.d.ts')).map(v => [v, join(root, v)])); + return { + ...features, + 'editor': join(root, 'src/editor.ts') + }; +} + const mappedPaths = { [join(root, 'node_modules/monaco-editor-core/esm/')]: '.', [join(root, 'node_modules/')]: 'external/', @@ -87,7 +120,7 @@ declare namespace languages { /** @deprecated Use the new top level "typescript" namespace instead. */ export const typescript: { deprecated: true }; } -`; + `; file.code = content; } } diff --git a/samples/browser-esm-vite/main.ts b/samples/browser-esm-vite/main.ts index 80c37603..2b793f8b 100644 --- a/samples/browser-esm-vite/main.ts +++ b/samples/browser-esm-vite/main.ts @@ -1,5 +1,17 @@ import './style.css'; -import * as monaco from '../../src/editor/editor.main'; +import * as monaco from '../../src/editor'; + +// import 'monaco-editor/nls/lang/de'; + +// import 'monaco-editor/languages/definitions/register.all'; +// import 'monaco-editor/features/register.all'; +//import 'monaco-editor/languages/definitions/register.all'; +//import 'monaco-editor/languages/features/register.all'; +//import 'monaco-editor'; + +//import * as monaco from 'monaco-editor/editor'; + +console.log('monaco', monaco); monaco.languages.register({ id: 'typescript' }); diff --git a/samples/browser-esm-vite/package-lock.json b/samples/browser-esm-vite/package-lock.json index ce2a295a..31c6b51a 100644 --- a/samples/browser-esm-vite/package-lock.json +++ b/samples/browser-esm-vite/package-lock.json @@ -6,11 +6,123 @@ "": { "name": "browser-esm-vite", "devDependencies": { - "monaco-editor": "^0.54.0", + "monaco-editor": "file:../../out/monaco-editor", "typescript": "^5.9.3", "vite": "^7.1.11" } }, + "../..": { + "version": "0.55.1", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "devDependencies": { + "@playwright/test": "^1.56.1", + "@rollup/plugin-alias": "^5.1.1", + "@rollup/plugin-node-resolve": "^16.0.2", + "@types/mocha": "^10.0.10", + "@types/shelljs": "^0.8.11", + "@types/trusted-types": "^1.0.6", + "@typescript/vfs": "^1.3.5", + "@vscode/monaco-lsp-client": "file:./monaco-lsp-client", + "chai": "^4.3.6", + "clean-css": "^5.2.4", + "css-loader": "^6.7.1", + "esbuild": "^0.25.9", + "esbuild-plugin-alias": "^0.2.1", + "file-loader": "^6.2.0", + "glob": "^7.2.0", + "http-server": "^14.1.1", + "husky": "^7.0.4", + "jsdom": "^19.0.0", + "jsonc-parser": "^3.0.0", + "mocha": "^11.7.4", + "monaco-editor-core": "^0.55.0-rc", + "parcel": "^2.7.0", + "pin-github-action": "^1.8.0", + "postcss-url": "^10.1.3", + "prettier": "^2.5.1", + "pretty-quick": "^3.1.3", + "requirejs": "^2.3.7", + "rollup": "^4.52.4", + "rollup-plugin-delete": "^3.0.1", + "rollup-plugin-dts": "^6.2.3", + "rollup-plugin-esbuild": "^6.2.1", + "rollup-plugin-import-css": "^4.0.2", + "rollup-plugin-keep-css-imports": "^1.0.0", + "shelljs": "^0.8.5", + "style-loader": "^3.3.1", + "terser": "^5.14.2", + "ts-node": "^10.6.0", + "typescript": "^5.9.3", + "vite": "^7.1.11", + "vscode-css-languageservice": "6.2.14", + "vscode-html-languageservice": "5.2.0", + "vscode-json-languageservice": "5.3.11", + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-languageserver-types": "3.17.5", + "vscode-uri": "3.0.8", + "webpack": "^5.76.0", + "yaserver": "^0.4.0" + } + }, + "../../out": { + "dev": true + }, + "../../out/monaco-editor": { + "version": "0.55.1", + "dev": true, + "license": "MIT", + "devDependencies": { + "@playwright/test": "^1.56.1", + "@rollup/plugin-alias": "^5.1.1", + "@rollup/plugin-node-resolve": "^16.0.2", + "@types/mocha": "^10.0.10", + "@types/shelljs": "^0.8.11", + "@types/trusted-types": "^1.0.6", + "@typescript/vfs": "^1.3.5", + "@vscode/monaco-lsp-client": "file:./monaco-lsp-client", + "chai": "^4.3.6", + "clean-css": "^5.2.4", + "css-loader": "^6.7.1", + "esbuild": "^0.25.9", + "esbuild-plugin-alias": "^0.2.1", + "file-loader": "^6.2.0", + "glob": "^7.2.0", + "http-server": "^14.1.1", + "husky": "^7.0.4", + "jsdom": "^19.0.0", + "jsonc-parser": "^3.0.0", + "mocha": "^11.7.4", + "monaco-editor-core": "^0.55.0-rc", + "parcel": "^2.7.0", + "pin-github-action": "^1.8.0", + "postcss-url": "^10.1.3", + "prettier": "^2.5.1", + "pretty-quick": "^3.1.3", + "requirejs": "^2.3.7", + "rollup": "^4.52.4", + "rollup-plugin-delete": "^3.0.1", + "rollup-plugin-dts": "^6.2.3", + "rollup-plugin-esbuild": "^6.2.1", + "rollup-plugin-import-css": "^4.0.2", + "rollup-plugin-keep-css-imports": "^1.0.0", + "shelljs": "^0.8.5", + "style-loader": "^3.3.1", + "terser": "^5.14.2", + "ts-node": "^10.6.0", + "typescript": "^5.9.3", + "vite": "^7.1.11", + "vscode-css-languageservice": "6.2.14", + "vscode-html-languageservice": "5.2.0", + "vscode-json-languageservice": "5.3.11", + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-languageserver-types": "3.17.5", + "vscode-uri": "3.0.8", + "webpack": "^5.76.0", + "yaserver": "^0.4.0" + } + }, "node_modules/@esbuild/aix-ppc64": { "version": "0.25.10", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.10.tgz", @@ -768,13 +880,6 @@ "dev": true, "license": "MIT" }, - "node_modules/dompurify": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.7.tgz", - "integrity": "sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==", - "dev": true, - "license": "(MPL-2.0 OR Apache-2.0)" - }, "node_modules/esbuild": { "version": "0.25.10", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.10.tgz", @@ -832,29 +937,9 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, - "node_modules/marked": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/marked/-/marked-14.0.0.tgz", - "integrity": "sha512-uIj4+faQ+MgHgwUW1l2PsPglZLOLOT1uErt06dAPtx2kjteLAkbsd/0FiYg/MGS+i7ZKLb7w2WClxHkzOOuryQ==", - "dev": true, - "license": "MIT", - "bin": { - "marked": "bin/marked.js" - }, - "engines": { - "node": ">= 18" - } - }, "node_modules/monaco-editor": { - "version": "0.54.0", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.54.0.tgz", - "integrity": "sha512-hx45SEUoLatgWxHKCmlLJH81xBo0uXP4sRkESUpmDQevfi+e7K1VuiSprK6UpQ8u4zOcKNiH0pMvHvlMWA/4cw==", - "dev": true, - "license": "MIT", - "dependencies": { - "dompurify": "3.1.7", - "marked": "14.0.0" - } + "resolved": "../../out/monaco-editor", + "link": true }, "node_modules/nanoid": { "version": "3.3.11", @@ -1474,12 +1559,6 @@ "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", "dev": true }, - "dompurify": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.7.tgz", - "integrity": "sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==", - "dev": true - }, "esbuild": { "version": "0.25.10", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.10.tgz", @@ -1521,20 +1600,56 @@ "dev": true, "optional": true }, - "marked": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/marked/-/marked-14.0.0.tgz", - "integrity": "sha512-uIj4+faQ+MgHgwUW1l2PsPglZLOLOT1uErt06dAPtx2kjteLAkbsd/0FiYg/MGS+i7ZKLb7w2WClxHkzOOuryQ==", - "dev": true - }, "monaco-editor": { - "version": "0.54.0", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.54.0.tgz", - "integrity": "sha512-hx45SEUoLatgWxHKCmlLJH81xBo0uXP4sRkESUpmDQevfi+e7K1VuiSprK6UpQ8u4zOcKNiH0pMvHvlMWA/4cw==", - "dev": true, + "version": "file:../../out/monaco-editor", "requires": { - "dompurify": "3.1.7", - "marked": "14.0.0" + "@playwright/test": "^1.56.1", + "@rollup/plugin-alias": "^5.1.1", + "@rollup/plugin-node-resolve": "^16.0.2", + "@types/mocha": "^10.0.10", + "@types/shelljs": "^0.8.11", + "@types/trusted-types": "^1.0.6", + "@typescript/vfs": "^1.3.5", + "@vscode/monaco-lsp-client": "file:monaco-lsp-client", + "chai": "^4.3.6", + "clean-css": "^5.2.4", + "css-loader": "^6.7.1", + "esbuild": "^0.25.9", + "esbuild-plugin-alias": "^0.2.1", + "file-loader": "^6.2.0", + "glob": "^7.2.0", + "http-server": "^14.1.1", + "husky": "^7.0.4", + "jsdom": "^19.0.0", + "jsonc-parser": "^3.0.0", + "mocha": "^11.7.4", + "monaco-editor-core": "^0.55.0-rc", + "parcel": "^2.7.0", + "pin-github-action": "^1.8.0", + "postcss-url": "^10.1.3", + "prettier": "^2.5.1", + "pretty-quick": "^3.1.3", + "requirejs": "^2.3.7", + "rollup": "^4.52.4", + "rollup-plugin-delete": "^3.0.1", + "rollup-plugin-dts": "^6.2.3", + "rollup-plugin-esbuild": "^6.2.1", + "rollup-plugin-import-css": "^4.0.2", + "rollup-plugin-keep-css-imports": "^1.0.0", + "shelljs": "^0.8.5", + "style-loader": "^3.3.1", + "terser": "^5.14.2", + "ts-node": "^10.6.0", + "typescript": "^5.9.3", + "vite": "^7.1.11", + "vscode-css-languageservice": "6.2.14", + "vscode-html-languageservice": "5.2.0", + "vscode-json-languageservice": "5.3.11", + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-languageserver-types": "3.17.5", + "vscode-uri": "3.0.8", + "webpack": "^5.76.0", + "yaserver": "^0.4.0" } }, "nanoid": { diff --git a/samples/browser-esm-vite/package.json b/samples/browser-esm-vite/package.json index b4335778..472e21e9 100644 --- a/samples/browser-esm-vite/package.json +++ b/samples/browser-esm-vite/package.json @@ -7,7 +7,7 @@ }, "dependencies": {}, "devDependencies": { - "monaco-editor": "^0.54.0", + "monaco-editor": "file:../../out/monaco-editor", "typescript": "^5.9.3", "vite": "^7.1.11" } diff --git a/samples/browser-esm-vite/tsconfig.json b/samples/browser-esm-vite/tsconfig.json index a42d3d80..15c48bc9 100644 --- a/samples/browser-esm-vite/tsconfig.json +++ b/samples/browser-esm-vite/tsconfig.json @@ -1,11 +1,20 @@ { "compilerOptions": { "target": "ESNext", + "useDefineForClassFields": true, + "lib": ["DOM", "DOM.Iterable", "ESNext"], + "allowJs": false, + "skipLibCheck": false, + "esModuleInterop": false, + "allowSyntheticDefaultImports": true, "strict": true, + "forceConsistentCasingInFileNames": true, "module": "ESNext", - "jsx": "react-jsx", - "moduleResolution": "node", - "allowSyntheticDefaultImports": true + "moduleResolution": "bundler", + "resolveJsonModule": true, + "isolatedModules": true, + "noEmit": true, + "jsx": "react-jsx" }, "include": ["./"] } diff --git a/src/basic-languages/monaco.contribution.ts b/src/basic-languages/monaco.contribution.ts deleted file mode 100644 index d6237742..00000000 --- a/src/basic-languages/monaco.contribution.ts +++ /dev/null @@ -1,86 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import './abap/abap.contribution'; -import './apex/apex.contribution'; -import './azcli/azcli.contribution'; -import './bat/bat.contribution'; -import './bicep/bicep.contribution'; -import './cameligo/cameligo.contribution'; -import './clojure/clojure.contribution'; -import './coffee/coffee.contribution'; -import './cpp/cpp.contribution'; -import './csharp/csharp.contribution'; -import './csp/csp.contribution'; -import './css/css.contribution'; -import './cypher/cypher.contribution'; -import './dart/dart.contribution'; -import './dockerfile/dockerfile.contribution'; -import './ecl/ecl.contribution'; -import './elixir/elixir.contribution'; -import './flow9/flow9.contribution'; -import './fsharp/fsharp.contribution'; -import './freemarker2/freemarker2.contribution'; -import './go/go.contribution'; -import './graphql/graphql.contribution'; -import './handlebars/handlebars.contribution'; -import './hcl/hcl.contribution'; -import './html/html.contribution'; -import './ini/ini.contribution'; -import './java/java.contribution'; -import './javascript/javascript.contribution'; -import './julia/julia.contribution'; -import './kotlin/kotlin.contribution'; -import './less/less.contribution'; -import './lexon/lexon.contribution'; -import './lua/lua.contribution'; -import './liquid/liquid.contribution'; -import './m3/m3.contribution'; -import './markdown/markdown.contribution'; -import './mdx/mdx.contribution'; -import './mips/mips.contribution'; -import './msdax/msdax.contribution'; -import './mysql/mysql.contribution'; -import './objective-c/objective-c.contribution'; -import './pascal/pascal.contribution'; -import './pascaligo/pascaligo.contribution'; -import './perl/perl.contribution'; -import './pgsql/pgsql.contribution'; -import './php/php.contribution'; -import './pla/pla.contribution'; -import './postiats/postiats.contribution'; -import './powerquery/powerquery.contribution'; -import './powershell/powershell.contribution'; -import './protobuf/protobuf.contribution'; -import './pug/pug.contribution'; -import './python/python.contribution'; -import './qsharp/qsharp.contribution'; -import './r/r.contribution'; -import './razor/razor.contribution'; -import './redis/redis.contribution'; -import './redshift/redshift.contribution'; -import './restructuredtext/restructuredtext.contribution'; -import './ruby/ruby.contribution'; -import './rust/rust.contribution'; -import './sb/sb.contribution'; -import './scala/scala.contribution'; -import './scheme/scheme.contribution'; -import './scss/scss.contribution'; -import './shell/shell.contribution'; -import './solidity/solidity.contribution'; -import './sophia/sophia.contribution'; -import './sparql/sparql.contribution'; -import './sql/sql.contribution'; -import './st/st.contribution'; -import './swift/swift.contribution'; -import './systemverilog/systemverilog.contribution'; -import './tcl/tcl.contribution'; -import './twig/twig.contribution'; -import './typescript/typescript.contribution'; -import './typespec/typespec.contribution'; -import './vb/vb.contribution'; -import './wgsl/wgsl.contribution'; -import './xml/xml.contribution'; -import './yaml/yaml.contribution'; diff --git a/src/editor/editor.api.ts b/src/editor.ts similarity index 56% rename from src/editor/editor.api.ts rename to src/editor.ts index 401981e4..7e39614a 100644 --- a/src/editor/editor.api.ts +++ b/src/editor.ts @@ -1,3 +1 @@ -import './internal/initialize'; -/// @ts-ignore export * from 'monaco-editor-core/esm/vs/editor/editor.api'; diff --git a/src/editor/edcore.main.ts b/src/editor/edcore.main.ts deleted file mode 100644 index b2c570c9..00000000 --- a/src/editor/edcore.main.ts +++ /dev/null @@ -1,2 +0,0 @@ -import './internal/initialize'; -export * from 'monaco-editor-core'; diff --git a/src/editor/editor.all.ts b/src/editor/editor.all.ts deleted file mode 100644 index e8e7ebfa..00000000 --- a/src/editor/editor.all.ts +++ /dev/null @@ -1,3 +0,0 @@ -import './internal/initialize'; -/// @ts-ignore -export * from 'monaco-editor-core/esm/vs/editor/editor.all'; diff --git a/src/editor/editor.main.ts b/src/editor/editor.main.ts deleted file mode 100644 index 293e2c7d..00000000 --- a/src/editor/editor.main.ts +++ /dev/null @@ -1,14 +0,0 @@ -import * as monaco from './internal/editorWithLanguages'; -import './internal/initialize'; -import { getGlobalMonaco } from './internal/initialize'; - -export * from './internal/editorWithLanguages'; - -// export to the global based API (for backwards compatibility only). -// Warning: We can only write to objects, not modules / namespaces! -// Writing to modules/namespace would confuse bundlers. -const monacoApi = getGlobalMonaco(); -monacoApi.languages.css = monaco.css; -monacoApi.languages.html = monaco.html; -monacoApi.languages.typescript = monaco.typescript; -monacoApi.languages.json = monaco.json; diff --git a/src/editor/editor.worker.ts b/src/editor/editor.worker.ts deleted file mode 100644 index 42721139..00000000 --- a/src/editor/editor.worker.ts +++ /dev/null @@ -1,20 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -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. -self.onmessage = () => { - if (!isWorkerInitialized()) { - worker.start(() => { - return {}; - }); - } else { - // this is handled because the worker is already initialized - } -}; - -export { initialize }; diff --git a/src/editor/internal/editorWithLanguages.ts b/src/editor/internal/editorWithLanguages.ts deleted file mode 100644 index 1919716f..00000000 --- a/src/editor/internal/editorWithLanguages.ts +++ /dev/null @@ -1,10 +0,0 @@ -import * as css from '../../language/css/monaco.contribution'; -import * as html from '../../language/html/monaco.contribution'; -import * as json from '../../language/json/monaco.contribution'; -import * as typescript from '../../language/typescript/monaco.contribution'; -import '../../basic-languages/monaco.contribution'; -import * as lsp from '@vscode/monaco-lsp-client'; - -export * from 'monaco-editor-core'; -export { createWebWorker, type IWebWorkerOptions } from '../../common/workers'; -export { css, html, json, typescript, lsp }; diff --git a/src/editor/internal/initialize.ts b/src/editor/internal/initialize.ts deleted file mode 100644 index fa0e0bdc..00000000 --- a/src/editor/internal/initialize.ts +++ /dev/null @@ -1,12 +0,0 @@ -import * as monaco from 'monaco-editor-core/esm/vs/editor/editor.api'; - -export function getGlobalMonaco(): any { - return monaco; -} - -// TODO@hediet get rid of the monaco global - -const monacoEnvironment: monaco.Environment | undefined = (globalThis as any).MonacoEnvironment; -if (monacoEnvironment?.globalAPI) { - (globalThis as any).monaco = getGlobalMonaco(); -} diff --git a/src/features/anchorSelect/register.d.ts b/src/features/anchorSelect/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/anchorSelect/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/anchorSelect/register.js b/src/features/anchorSelect/register.js new file mode 100644 index 00000000..9814f787 --- /dev/null +++ b/src/features/anchorSelect/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/anchorSelect/browser/anchorSelect'; diff --git a/src/features/bracketMatching/register.d.ts b/src/features/bracketMatching/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/bracketMatching/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/bracketMatching/register.js b/src/features/bracketMatching/register.js new file mode 100644 index 00000000..c1f804e1 --- /dev/null +++ b/src/features/bracketMatching/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/bracketMatching/browser/bracketMatching'; diff --git a/src/features/caretOperations/register.d.ts b/src/features/caretOperations/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/caretOperations/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/caretOperations/register.js b/src/features/caretOperations/register.js new file mode 100644 index 00000000..fb87b2d7 --- /dev/null +++ b/src/features/caretOperations/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/caretOperations/browser/transpose'; diff --git a/src/features/clipboard/register.d.ts b/src/features/clipboard/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/clipboard/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/clipboard/register.js b/src/features/clipboard/register.js new file mode 100644 index 00000000..302e9910 --- /dev/null +++ b/src/features/clipboard/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/clipboard/browser/clipboard'; diff --git a/src/features/codeAction/register.d.ts b/src/features/codeAction/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/codeAction/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/codeAction/register.js b/src/features/codeAction/register.js new file mode 100644 index 00000000..41e303dc --- /dev/null +++ b/src/features/codeAction/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/codeAction/browser/codeActionContributions'; diff --git a/src/features/codeEditor/register.d.ts b/src/features/codeEditor/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/codeEditor/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/codeEditor/register.js b/src/features/codeEditor/register.js new file mode 100644 index 00000000..b8aebc8e --- /dev/null +++ b/src/features/codeEditor/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/browser/widget/codeEditor/codeEditorWidget'; diff --git a/src/features/codelens/register.d.ts b/src/features/codelens/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/codelens/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/codelens/register.js b/src/features/codelens/register.js new file mode 100644 index 00000000..e690dc9a --- /dev/null +++ b/src/features/codelens/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/codelens/browser/codelensController'; diff --git a/src/features/codicon/register.d.ts b/src/features/codicon/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/codicon/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/codicon/register.js b/src/features/codicon/register.js new file mode 100644 index 00000000..031fd371 --- /dev/null +++ b/src/features/codicon/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/base/browser/ui/codicons/codicon/codicon.css'; diff --git a/src/features/colorPicker/register.d.ts b/src/features/colorPicker/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/colorPicker/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/colorPicker/register.js b/src/features/colorPicker/register.js new file mode 100644 index 00000000..fc5ed54d --- /dev/null +++ b/src/features/colorPicker/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/colorPicker/browser/colorPickerContribution'; diff --git a/src/features/comment/register.d.ts b/src/features/comment/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/comment/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/comment/register.js b/src/features/comment/register.js new file mode 100644 index 00000000..e8931d41 --- /dev/null +++ b/src/features/comment/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/comment/browser/comment'; diff --git a/src/features/contextmenu/register.d.ts b/src/features/contextmenu/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/contextmenu/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/contextmenu/register.js b/src/features/contextmenu/register.js new file mode 100644 index 00000000..e04c9db5 --- /dev/null +++ b/src/features/contextmenu/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/contextmenu/browser/contextmenu'; diff --git a/src/features/cursorUndo/register.d.ts b/src/features/cursorUndo/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/cursorUndo/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/cursorUndo/register.js b/src/features/cursorUndo/register.js new file mode 100644 index 00000000..024f2582 --- /dev/null +++ b/src/features/cursorUndo/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/cursorUndo/browser/cursorUndo'; diff --git a/src/features/diffEditor/register.d.ts b/src/features/diffEditor/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/diffEditor/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/diffEditor/register.js b/src/features/diffEditor/register.js new file mode 100644 index 00000000..b34bfefb --- /dev/null +++ b/src/features/diffEditor/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/browser/widget/diffEditor/diffEditor.contribution'; diff --git a/src/features/diffEditorBreadcrumbs/register.d.ts b/src/features/diffEditorBreadcrumbs/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/diffEditorBreadcrumbs/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/diffEditorBreadcrumbs/register.js b/src/features/diffEditorBreadcrumbs/register.js new file mode 100644 index 00000000..dbee42af --- /dev/null +++ b/src/features/diffEditorBreadcrumbs/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/diffEditorBreadcrumbs/browser/contribution'; diff --git a/src/features/dnd/register.d.ts b/src/features/dnd/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/dnd/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/dnd/register.js b/src/features/dnd/register.js new file mode 100644 index 00000000..9e094641 --- /dev/null +++ b/src/features/dnd/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/dnd/browser/dnd'; diff --git a/src/features/documentSymbols/register.d.ts b/src/features/documentSymbols/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/documentSymbols/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/documentSymbols/register.js b/src/features/documentSymbols/register.js new file mode 100644 index 00000000..8f0b72a0 --- /dev/null +++ b/src/features/documentSymbols/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/documentSymbols/browser/documentSymbols'; diff --git a/src/features/dropOrPasteInto/register.d.ts b/src/features/dropOrPasteInto/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/dropOrPasteInto/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/dropOrPasteInto/register.js b/src/features/dropOrPasteInto/register.js new file mode 100644 index 00000000..417b4c72 --- /dev/null +++ b/src/features/dropOrPasteInto/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorContribution'; diff --git a/src/features/find/register.d.ts b/src/features/find/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/find/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/find/register.js b/src/features/find/register.js new file mode 100644 index 00000000..6c79c8f5 --- /dev/null +++ b/src/features/find/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/find/browser/findController'; diff --git a/src/features/floatingMenu/register.d.ts b/src/features/floatingMenu/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/floatingMenu/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/floatingMenu/register.js b/src/features/floatingMenu/register.js new file mode 100644 index 00000000..3ce07a65 --- /dev/null +++ b/src/features/floatingMenu/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/floatingMenu/browser/floatingMenu.contribution'; diff --git a/src/features/folding/register.d.ts b/src/features/folding/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/folding/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/folding/register.js b/src/features/folding/register.js new file mode 100644 index 00000000..3c93f9d0 --- /dev/null +++ b/src/features/folding/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/folding/browser/folding'; diff --git a/src/features/fontZoom/register.d.ts b/src/features/fontZoom/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/fontZoom/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/fontZoom/register.js b/src/features/fontZoom/register.js new file mode 100644 index 00000000..d5525bba --- /dev/null +++ b/src/features/fontZoom/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/fontZoom/browser/fontZoom'; diff --git a/src/features/format/register.d.ts b/src/features/format/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/format/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/format/register.js b/src/features/format/register.js new file mode 100644 index 00000000..9647fce7 --- /dev/null +++ b/src/features/format/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/format/browser/formatActions'; diff --git a/src/features/gotoError/register.d.ts b/src/features/gotoError/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/gotoError/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/gotoError/register.js b/src/features/gotoError/register.js new file mode 100644 index 00000000..3a2143e8 --- /dev/null +++ b/src/features/gotoError/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/gotoError/browser/gotoError'; diff --git a/src/features/gotoLine/register.d.ts b/src/features/gotoLine/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/gotoLine/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/gotoLine/register.js b/src/features/gotoLine/register.js new file mode 100644 index 00000000..036fee79 --- /dev/null +++ b/src/features/gotoLine/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess'; diff --git a/src/features/gotoSymbol/register.d.ts b/src/features/gotoSymbol/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/gotoSymbol/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/gotoSymbol/register.js b/src/features/gotoSymbol/register.js new file mode 100644 index 00000000..8b167e20 --- /dev/null +++ b/src/features/gotoSymbol/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition'; diff --git a/src/features/gpu/register.d.ts b/src/features/gpu/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/gpu/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/gpu/register.js b/src/features/gpu/register.js new file mode 100644 index 00000000..91c3b89c --- /dev/null +++ b/src/features/gpu/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/gpu/browser/gpuActions'; diff --git a/src/features/hover/register.d.ts b/src/features/hover/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/hover/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/hover/register.js b/src/features/hover/register.js new file mode 100644 index 00000000..c2c2e90d --- /dev/null +++ b/src/features/hover/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/hover/browser/hoverContribution'; diff --git a/src/features/iPadShowKeyboard/register.d.ts b/src/features/iPadShowKeyboard/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/iPadShowKeyboard/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/iPadShowKeyboard/register.js b/src/features/iPadShowKeyboard/register.js new file mode 100644 index 00000000..e10bf40d --- /dev/null +++ b/src/features/iPadShowKeyboard/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard'; diff --git a/src/features/inPlaceReplace/register.d.ts b/src/features/inPlaceReplace/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/inPlaceReplace/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/inPlaceReplace/register.js b/src/features/inPlaceReplace/register.js new file mode 100644 index 00000000..fa405ad9 --- /dev/null +++ b/src/features/inPlaceReplace/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace'; diff --git a/src/features/indentation/register.d.ts b/src/features/indentation/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/indentation/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/indentation/register.js b/src/features/indentation/register.js new file mode 100644 index 00000000..76d91345 --- /dev/null +++ b/src/features/indentation/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/indentation/browser/indentation'; diff --git a/src/features/inlayHints/register.d.ts b/src/features/inlayHints/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/inlayHints/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/inlayHints/register.js b/src/features/inlayHints/register.js new file mode 100644 index 00000000..67593a19 --- /dev/null +++ b/src/features/inlayHints/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/inlayHints/browser/inlayHintsContribution'; diff --git a/src/features/inlineCompletions/register.d.ts b/src/features/inlineCompletions/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/inlineCompletions/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/inlineCompletions/register.js b/src/features/inlineCompletions/register.js new file mode 100644 index 00000000..08d2b1c3 --- /dev/null +++ b/src/features/inlineCompletions/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution'; diff --git a/src/features/inlineProgress/register.d.ts b/src/features/inlineProgress/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/inlineProgress/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/inlineProgress/register.js b/src/features/inlineProgress/register.js new file mode 100644 index 00000000..3a781800 --- /dev/null +++ b/src/features/inlineProgress/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/inlineProgress/browser/inlineProgress'; diff --git a/src/features/insertFinalNewLine/register.d.ts b/src/features/insertFinalNewLine/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/insertFinalNewLine/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/insertFinalNewLine/register.js b/src/features/insertFinalNewLine/register.js new file mode 100644 index 00000000..d27a0d04 --- /dev/null +++ b/src/features/insertFinalNewLine/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/insertFinalNewLine/browser/insertFinalNewLine'; diff --git a/src/features/inspectTokens/register.d.ts b/src/features/inspectTokens/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/inspectTokens/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/inspectTokens/register.js b/src/features/inspectTokens/register.js new file mode 100644 index 00000000..147fefe4 --- /dev/null +++ b/src/features/inspectTokens/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/standalone/browser/inspectTokens/inspectTokens'; diff --git a/src/features/lineSelection/register.d.ts b/src/features/lineSelection/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/lineSelection/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/lineSelection/register.js b/src/features/lineSelection/register.js new file mode 100644 index 00000000..39f42b34 --- /dev/null +++ b/src/features/lineSelection/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/lineSelection/browser/lineSelection'; diff --git a/src/features/linesOperations/register.d.ts b/src/features/linesOperations/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/linesOperations/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/linesOperations/register.js b/src/features/linesOperations/register.js new file mode 100644 index 00000000..94c70cd3 --- /dev/null +++ b/src/features/linesOperations/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/linesOperations/browser/linesOperations'; diff --git a/src/features/linkedEditing/register.d.ts b/src/features/linkedEditing/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/linkedEditing/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/linkedEditing/register.js b/src/features/linkedEditing/register.js new file mode 100644 index 00000000..11f270eb --- /dev/null +++ b/src/features/linkedEditing/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/linkedEditing/browser/linkedEditing'; diff --git a/src/features/links/register.d.ts b/src/features/links/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/links/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/links/register.js b/src/features/links/register.js new file mode 100644 index 00000000..2973161b --- /dev/null +++ b/src/features/links/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/links/browser/links'; diff --git a/src/features/longLinesHelper/register.d.ts b/src/features/longLinesHelper/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/longLinesHelper/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/longLinesHelper/register.js b/src/features/longLinesHelper/register.js new file mode 100644 index 00000000..660efccc --- /dev/null +++ b/src/features/longLinesHelper/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/longLinesHelper/browser/longLinesHelper'; diff --git a/src/features/middleScroll/register.d.ts b/src/features/middleScroll/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/middleScroll/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/middleScroll/register.js b/src/features/middleScroll/register.js new file mode 100644 index 00000000..c2974f71 --- /dev/null +++ b/src/features/middleScroll/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/middleScroll/browser/middleScroll.contribution'; diff --git a/src/features/multicursor/register.d.ts b/src/features/multicursor/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/multicursor/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/multicursor/register.js b/src/features/multicursor/register.js new file mode 100644 index 00000000..0332df91 --- /dev/null +++ b/src/features/multicursor/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/multicursor/browser/multicursor'; diff --git a/src/features/parameterHints/register.d.ts b/src/features/parameterHints/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/parameterHints/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/parameterHints/register.js b/src/features/parameterHints/register.js new file mode 100644 index 00000000..f7c3883f --- /dev/null +++ b/src/features/parameterHints/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/parameterHints/browser/parameterHints'; diff --git a/src/features/placeholderText/register.d.ts b/src/features/placeholderText/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/placeholderText/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/placeholderText/register.js b/src/features/placeholderText/register.js new file mode 100644 index 00000000..7b36bc46 --- /dev/null +++ b/src/features/placeholderText/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/placeholderText/browser/placeholderText.contribution'; diff --git a/src/features/quickCommand/register.d.ts b/src/features/quickCommand/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/quickCommand/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/quickCommand/register.js b/src/features/quickCommand/register.js new file mode 100644 index 00000000..06c2bf01 --- /dev/null +++ b/src/features/quickCommand/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/standalone/browser/quickAccess/standaloneCommandsQuickAccess'; diff --git a/src/features/quickHelp/register.d.ts b/src/features/quickHelp/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/quickHelp/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/quickHelp/register.js b/src/features/quickHelp/register.js new file mode 100644 index 00000000..e6c34f33 --- /dev/null +++ b/src/features/quickHelp/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/standalone/browser/quickAccess/standaloneHelpQuickAccess'; diff --git a/src/features/quickOutline/register.d.ts b/src/features/quickOutline/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/quickOutline/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/quickOutline/register.js b/src/features/quickOutline/register.js new file mode 100644 index 00000000..19e093ae --- /dev/null +++ b/src/features/quickOutline/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess'; diff --git a/src/features/readOnlyMessage/register.d.ts b/src/features/readOnlyMessage/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/readOnlyMessage/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/readOnlyMessage/register.js b/src/features/readOnlyMessage/register.js new file mode 100644 index 00000000..3a0d486e --- /dev/null +++ b/src/features/readOnlyMessage/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/readOnlyMessage/browser/contribution'; diff --git a/src/features/referenceSearch/register.d.ts b/src/features/referenceSearch/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/referenceSearch/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/referenceSearch/register.js b/src/features/referenceSearch/register.js new file mode 100644 index 00000000..be7efca5 --- /dev/null +++ b/src/features/referenceSearch/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch'; diff --git a/src/features/register.all.ts b/src/features/register.all.ts new file mode 100644 index 00000000..089f7d98 --- /dev/null +++ b/src/features/register.all.ts @@ -0,0 +1,65 @@ +import './anchorSelect/register'; +import './bracketMatching/register'; +import './caretOperations/register'; +import './clipboard/register'; +import './codeAction/register'; +import './codeEditor/register'; +import './codelens/register'; +import './codicon/register'; +import './colorPicker/register'; +import './comment/register'; +import './contextmenu/register'; +import './cursorUndo/register'; +import './diffEditor/register'; +import './diffEditorBreadcrumbs/register'; +import './dnd/register'; +import './documentSymbols/register'; +import './dropOrPasteInto/register'; +import './find/register'; +import './floatingMenu/register'; +import './folding/register'; +import './fontZoom/register'; +import './format/register'; +import './gotoError/register'; +import './gotoLine/register'; +import './gotoSymbol/register'; +import './gpu/register'; +import './hover/register'; +import './indentation/register'; +import './inlayHints/register'; +import './inlineCompletions/register'; +import './inlineProgress/register'; +import './inPlaceReplace/register'; +import './insertFinalNewLine/register'; +import './inspectTokens/register'; +import './iPadShowKeyboard/register'; +import './lineSelection/register'; +import './linesOperations/register'; +import './linkedEditing/register'; +import './links/register'; +import './longLinesHelper/register'; +import './middleScroll/register'; +import './multicursor/register'; +import './parameterHints/register'; +import './placeholderText/register'; +import './quickCommand/register'; +import './quickHelp/register'; +import './quickOutline/register'; +import './readOnlyMessage/register'; +import './referenceSearch/register'; +import './rename/register'; +import './sectionHeaders/register'; +import './semanticTokens/register'; +import './smartSelect/register'; +import './snippet/register'; +import './stickyScroll/register'; +import './suggest/register'; +import './toggleHighContrast/register'; +import './toggleTabFocusMode/register'; +import './tokenization/register'; +import './unicodeHighlighter/register'; +import './unusualLineTerminators/register'; +import './wordHighlighter/register'; +import './wordOperations/register'; +import './wordPartOperations/register'; + diff --git a/src/features/rename/register.d.ts b/src/features/rename/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/rename/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/rename/register.js b/src/features/rename/register.js new file mode 100644 index 00000000..03afe08f --- /dev/null +++ b/src/features/rename/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/rename/browser/rename'; diff --git a/src/features/sectionHeaders/register.d.ts b/src/features/sectionHeaders/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/sectionHeaders/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/sectionHeaders/register.js b/src/features/sectionHeaders/register.js new file mode 100644 index 00000000..b97efa32 --- /dev/null +++ b/src/features/sectionHeaders/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/sectionHeaders/browser/sectionHeaders'; diff --git a/src/features/semanticTokens/register.d.ts b/src/features/semanticTokens/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/semanticTokens/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/semanticTokens/register.js b/src/features/semanticTokens/register.js new file mode 100644 index 00000000..8dcdae40 --- /dev/null +++ b/src/features/semanticTokens/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/semanticTokens/browser/viewportSemanticTokens'; diff --git a/src/features/smartSelect/register.d.ts b/src/features/smartSelect/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/smartSelect/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/smartSelect/register.js b/src/features/smartSelect/register.js new file mode 100644 index 00000000..c2e61d1a --- /dev/null +++ b/src/features/smartSelect/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/smartSelect/browser/smartSelect'; diff --git a/src/features/snippet/register.d.ts b/src/features/snippet/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/snippet/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/snippet/register.js b/src/features/snippet/register.js new file mode 100644 index 00000000..679d6291 --- /dev/null +++ b/src/features/snippet/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/snippet/browser/snippetController2'; diff --git a/src/features/stickyScroll/register.d.ts b/src/features/stickyScroll/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/stickyScroll/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/stickyScroll/register.js b/src/features/stickyScroll/register.js new file mode 100644 index 00000000..e803d308 --- /dev/null +++ b/src/features/stickyScroll/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/stickyScroll/browser/stickyScrollContribution'; diff --git a/src/features/suggest/register.d.ts b/src/features/suggest/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/suggest/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/suggest/register.js b/src/features/suggest/register.js new file mode 100644 index 00000000..93e5f1db --- /dev/null +++ b/src/features/suggest/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/suggest/browser/suggestInlineCompletions'; diff --git a/src/features/toggleHighContrast/register.d.ts b/src/features/toggleHighContrast/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/toggleHighContrast/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/toggleHighContrast/register.js b/src/features/toggleHighContrast/register.js new file mode 100644 index 00000000..b912660a --- /dev/null +++ b/src/features/toggleHighContrast/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/standalone/browser/toggleHighContrast/toggleHighContrast'; diff --git a/src/features/toggleTabFocusMode/register.d.ts b/src/features/toggleTabFocusMode/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/toggleTabFocusMode/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/toggleTabFocusMode/register.js b/src/features/toggleTabFocusMode/register.js new file mode 100644 index 00000000..1b762bd6 --- /dev/null +++ b/src/features/toggleTabFocusMode/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode'; diff --git a/src/features/tokenization/register.d.ts b/src/features/tokenization/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/tokenization/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/tokenization/register.js b/src/features/tokenization/register.js new file mode 100644 index 00000000..4999df23 --- /dev/null +++ b/src/features/tokenization/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/tokenization/browser/tokenization'; diff --git a/src/features/unicodeHighlighter/register.d.ts b/src/features/unicodeHighlighter/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/unicodeHighlighter/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/unicodeHighlighter/register.js b/src/features/unicodeHighlighter/register.js new file mode 100644 index 00000000..4b31f190 --- /dev/null +++ b/src/features/unicodeHighlighter/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter'; diff --git a/src/features/unusualLineTerminators/register.d.ts b/src/features/unusualLineTerminators/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/unusualLineTerminators/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/unusualLineTerminators/register.js b/src/features/unusualLineTerminators/register.js new file mode 100644 index 00000000..e3bf0e85 --- /dev/null +++ b/src/features/unusualLineTerminators/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators'; diff --git a/src/features/wordHighlighter/register.d.ts b/src/features/wordHighlighter/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/wordHighlighter/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/wordHighlighter/register.js b/src/features/wordHighlighter/register.js new file mode 100644 index 00000000..0aa8f220 --- /dev/null +++ b/src/features/wordHighlighter/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/wordHighlighter/browser/wordHighlighter'; diff --git a/src/features/wordOperations/register.d.ts b/src/features/wordOperations/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/wordOperations/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/wordOperations/register.js b/src/features/wordOperations/register.js new file mode 100644 index 00000000..66193a80 --- /dev/null +++ b/src/features/wordOperations/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/wordOperations/browser/wordOperations'; diff --git a/src/features/wordPartOperations/register.d.ts b/src/features/wordPartOperations/register.d.ts new file mode 100644 index 00000000..2234b9ca --- /dev/null +++ b/src/features/wordPartOperations/register.d.ts @@ -0,0 +1 @@ +export { }; diff --git a/src/features/wordPartOperations/register.js b/src/features/wordPartOperations/register.js new file mode 100644 index 00000000..70f648a9 --- /dev/null +++ b/src/features/wordPartOperations/register.js @@ -0,0 +1 @@ +import 'monaco-editor-core/esm/vs/editor/contrib/wordPartOperations/browser/wordPartOperations'; diff --git a/src/index.ts b/src/index.ts new file mode 100644 index 00000000..03f83764 --- /dev/null +++ b/src/index.ts @@ -0,0 +1,9 @@ +import * as lsp from '@vscode/monaco-lsp-client'; +import { css, html, json, typescript } from './languages/register.all'; +import './features/register.all'; + +// ensure that the the main monaco-editor entry-point loads all features from monaco-editor-core +import 'monaco-editor-core'; + +export * from './editor'; +export { css, html, json, typescript, lsp }; diff --git a/src/common/initialize.ts b/src/internal/common/initialize.ts similarity index 100% rename from src/common/initialize.ts rename to src/internal/common/initialize.ts diff --git a/src/common/workers.ts b/src/internal/common/workers.ts similarity index 100% rename from src/common/workers.ts rename to src/internal/common/workers.ts diff --git a/src/basic-languages/_.contribution.ts b/src/languages/definitions/_.contribution.ts similarity index 97% rename from src/basic-languages/_.contribution.ts rename to src/languages/definitions/_.contribution.ts index 4e9e09af..2f515d36 100644 --- a/src/basic-languages/_.contribution.ts +++ b/src/languages/definitions/_.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 'monaco-editor-core'; +import { languages, editor } from '../../editor'; interface ILang extends languages.ILanguageExtensionPoint { loader: () => Promise; diff --git a/src/basic-languages/abap/abap.test.ts b/src/languages/definitions/abap/abap.test.ts similarity index 100% rename from src/basic-languages/abap/abap.test.ts rename to src/languages/definitions/abap/abap.test.ts diff --git a/src/basic-languages/abap/abap.ts b/src/languages/definitions/abap/abap.ts similarity index 99% rename from src/basic-languages/abap/abap.ts rename to src/languages/definitions/abap/abap.ts index e5d66c94..9dd60e4d 100644 --- a/src/basic-languages/abap/abap.ts +++ b/src/languages/definitions/abap/abap.ts @@ -14,7 +14,7 @@ * *--------------------------------------------------------------------------------------------*/ -import type { languages } from 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/abap/abap.contribution.ts b/src/languages/definitions/abap/register.ts similarity index 100% rename from src/basic-languages/abap/abap.contribution.ts rename to src/languages/definitions/abap/register.ts diff --git a/src/basic-languages/apex/apex.test.ts b/src/languages/definitions/apex/apex.test.ts similarity index 100% rename from src/basic-languages/apex/apex.test.ts rename to src/languages/definitions/apex/apex.test.ts diff --git a/src/basic-languages/apex/apex.ts b/src/languages/definitions/apex/apex.ts similarity index 99% rename from src/basic-languages/apex/apex.ts rename to src/languages/definitions/apex/apex.ts index 2bb8d467..05088a96 100644 --- a/src/basic-languages/apex/apex.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { // the default separators except `@$` diff --git a/src/basic-languages/apex/apex.contribution.ts b/src/languages/definitions/apex/register.ts similarity index 100% rename from src/basic-languages/apex/apex.contribution.ts rename to src/languages/definitions/apex/register.ts diff --git a/src/basic-languages/azcli/azcli.test.ts b/src/languages/definitions/azcli/azcli.test.ts similarity index 100% rename from src/basic-languages/azcli/azcli.test.ts rename to src/languages/definitions/azcli/azcli.test.ts diff --git a/src/basic-languages/azcli/azcli.ts b/src/languages/definitions/azcli/azcli.ts similarity index 96% rename from src/basic-languages/azcli/azcli.ts rename to src/languages/definitions/azcli/azcli.ts index cbfba350..a7ceb150 100644 --- a/src/basic-languages/azcli/azcli.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/azcli/azcli.contribution.ts b/src/languages/definitions/azcli/register.ts similarity index 100% rename from src/basic-languages/azcli/azcli.contribution.ts rename to src/languages/definitions/azcli/register.ts diff --git a/src/basic-languages/bat/bat.test.ts b/src/languages/definitions/bat/bat.test.ts similarity index 100% rename from src/basic-languages/bat/bat.test.ts rename to src/languages/definitions/bat/bat.test.ts diff --git a/src/basic-languages/bat/bat.ts b/src/languages/definitions/bat/bat.ts similarity index 98% rename from src/basic-languages/bat/bat.ts rename to src/languages/definitions/bat/bat.ts index 3d1975d8..e17d77b1 100644 --- a/src/basic-languages/bat/bat.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/bat/bat.contribution.ts b/src/languages/definitions/bat/register.ts similarity index 100% rename from src/basic-languages/bat/bat.contribution.ts rename to src/languages/definitions/bat/register.ts diff --git a/src/basic-languages/bicep/bicep.test.ts b/src/languages/definitions/bicep/bicep.test.ts similarity index 100% rename from src/basic-languages/bicep/bicep.test.ts rename to src/languages/definitions/bicep/bicep.test.ts diff --git a/src/basic-languages/bicep/bicep.ts b/src/languages/definitions/bicep/bicep.ts similarity index 98% rename from src/basic-languages/bicep/bicep.ts rename to src/languages/definitions/bicep/bicep.ts index 69cd8a7b..9676debd 100644 --- a/src/basic-languages/bicep/bicep.ts +++ b/src/languages/definitions/bicep/bicep.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -import type { languages } from 'monaco-editor-core'; +import type { languages } from '../../../editor'; const bounded = (text: string) => `\\b${text}\\b`; diff --git a/src/basic-languages/bicep/bicep.contribution.ts b/src/languages/definitions/bicep/register.ts similarity index 100% rename from src/basic-languages/bicep/bicep.contribution.ts rename to src/languages/definitions/bicep/register.ts diff --git a/src/basic-languages/cameligo/cameligo.test.ts b/src/languages/definitions/cameligo/cameligo.test.ts similarity index 100% rename from src/basic-languages/cameligo/cameligo.test.ts rename to src/languages/definitions/cameligo/cameligo.test.ts diff --git a/src/basic-languages/cameligo/cameligo.ts b/src/languages/definitions/cameligo/cameligo.ts similarity index 98% rename from src/basic-languages/cameligo/cameligo.ts rename to src/languages/definitions/cameligo/cameligo.ts index 1be6401f..e977e2f2 100644 --- a/src/basic-languages/cameligo/cameligo.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/cameligo/cameligo.contribution.ts b/src/languages/definitions/cameligo/register.ts similarity index 100% rename from src/basic-languages/cameligo/cameligo.contribution.ts rename to src/languages/definitions/cameligo/register.ts diff --git a/src/basic-languages/clojure/clojure.test.ts b/src/languages/definitions/clojure/clojure.test.ts similarity index 100% rename from src/basic-languages/clojure/clojure.test.ts rename to src/languages/definitions/clojure/clojure.test.ts diff --git a/src/basic-languages/clojure/clojure.ts b/src/languages/definitions/clojure/clojure.ts similarity index 99% rename from src/basic-languages/clojure/clojure.ts rename to src/languages/definitions/clojure/clojure.ts index c514c3c3..cd104829 100644 --- a/src/basic-languages/clojure/clojure.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/clojure/clojure.contribution.ts b/src/languages/definitions/clojure/register.ts similarity index 100% rename from src/basic-languages/clojure/clojure.contribution.ts rename to src/languages/definitions/clojure/register.ts diff --git a/src/basic-languages/coffee/coffee.test.ts b/src/languages/definitions/coffee/coffee.test.ts similarity index 100% rename from src/basic-languages/coffee/coffee.test.ts rename to src/languages/definitions/coffee/coffee.test.ts diff --git a/src/basic-languages/coffee/coffee.ts b/src/languages/definitions/coffee/coffee.ts similarity index 99% rename from src/basic-languages/coffee/coffee.ts rename to src/languages/definitions/coffee/coffee.ts index 0607df69..dd18f2de 100644 --- a/src/basic-languages/coffee/coffee.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { wordPattern: diff --git a/src/basic-languages/coffee/coffee.contribution.ts b/src/languages/definitions/coffee/register.ts similarity index 100% rename from src/basic-languages/coffee/coffee.contribution.ts rename to src/languages/definitions/coffee/register.ts diff --git a/src/basic-languages/cpp/cpp.test.ts b/src/languages/definitions/cpp/cpp.test.ts similarity index 100% rename from src/basic-languages/cpp/cpp.test.ts rename to src/languages/definitions/cpp/cpp.test.ts diff --git a/src/basic-languages/cpp/cpp.ts b/src/languages/definitions/cpp/cpp.ts similarity index 99% rename from src/basic-languages/cpp/cpp.ts rename to src/languages/definitions/cpp/cpp.ts index c9b0a702..9ace704d 100644 --- a/src/basic-languages/cpp/cpp.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/cpp/cpp.contribution.ts b/src/languages/definitions/cpp/register.ts similarity index 100% rename from src/basic-languages/cpp/cpp.contribution.ts rename to src/languages/definitions/cpp/register.ts diff --git a/src/basic-languages/csharp/csharp.test.ts b/src/languages/definitions/csharp/csharp.test.ts similarity index 100% rename from src/basic-languages/csharp/csharp.test.ts rename to src/languages/definitions/csharp/csharp.test.ts diff --git a/src/basic-languages/csharp/csharp.ts b/src/languages/definitions/csharp/csharp.ts similarity index 99% rename from src/basic-languages/csharp/csharp.ts rename to src/languages/definitions/csharp/csharp.ts index 9b08c7ed..658e983f 100644 --- a/src/basic-languages/csharp/csharp.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { wordPattern: diff --git a/src/basic-languages/csharp/csharp.contribution.ts b/src/languages/definitions/csharp/register.ts similarity index 100% rename from src/basic-languages/csharp/csharp.contribution.ts rename to src/languages/definitions/csharp/register.ts diff --git a/src/basic-languages/csp/csp.test.ts b/src/languages/definitions/csp/csp.test.ts similarity index 100% rename from src/basic-languages/csp/csp.test.ts rename to src/languages/definitions/csp/csp.test.ts diff --git a/src/basic-languages/csp/csp.ts b/src/languages/definitions/csp/csp.ts similarity index 97% rename from src/basic-languages/csp/csp.ts rename to src/languages/definitions/csp/csp.ts index 21e61a38..1a5cbf2a 100644 --- a/src/basic-languages/csp/csp.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { brackets: [], diff --git a/src/basic-languages/csp/csp.contribution.ts b/src/languages/definitions/csp/register.ts similarity index 100% rename from src/basic-languages/csp/csp.contribution.ts rename to src/languages/definitions/csp/register.ts diff --git a/src/basic-languages/css/css.test.ts b/src/languages/definitions/css/css.test.ts similarity index 100% rename from src/basic-languages/css/css.test.ts rename to src/languages/definitions/css/css.test.ts diff --git a/src/basic-languages/css/css.ts b/src/languages/definitions/css/css.ts similarity index 99% rename from src/basic-languages/css/css.ts rename to src/languages/definitions/css/css.ts index b7fb51ff..c1fdcc3f 100644 --- a/src/basic-languages/css/css.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { wordPattern: /(#?-?\d*\.\d\w*%?)|((::|[@#.!:])?[\w-?]+%?)|::|[@#.!:]/g, diff --git a/src/basic-languages/css/css.contribution.ts b/src/languages/definitions/css/register.ts similarity index 100% rename from src/basic-languages/css/css.contribution.ts rename to src/languages/definitions/css/register.ts diff --git a/src/basic-languages/cypher/cypher.test.ts b/src/languages/definitions/cypher/cypher.test.ts similarity index 100% rename from src/basic-languages/cypher/cypher.test.ts rename to src/languages/definitions/cypher/cypher.test.ts diff --git a/src/basic-languages/cypher/cypher.ts b/src/languages/definitions/cypher/cypher.ts similarity index 99% rename from src/basic-languages/cypher/cypher.ts rename to src/languages/definitions/cypher/cypher.ts index 20c56d97..46c0b704 100644 --- a/src/basic-languages/cypher/cypher.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/cypher/cypher.contribution.ts b/src/languages/definitions/cypher/register.ts similarity index 100% rename from src/basic-languages/cypher/cypher.contribution.ts rename to src/languages/definitions/cypher/register.ts diff --git a/src/basic-languages/dart/dart.test.ts b/src/languages/definitions/dart/dart.test.ts similarity index 100% rename from src/basic-languages/dart/dart.test.ts rename to src/languages/definitions/dart/dart.test.ts diff --git a/src/basic-languages/dart/dart.ts b/src/languages/definitions/dart/dart.ts similarity index 99% rename from src/basic-languages/dart/dart.ts rename to src/languages/definitions/dart/dart.ts index c977d8b9..08913fdf 100644 --- a/src/basic-languages/dart/dart.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/dart/dart.contribution.ts b/src/languages/definitions/dart/register.ts similarity index 100% rename from src/basic-languages/dart/dart.contribution.ts rename to src/languages/definitions/dart/register.ts diff --git a/src/basic-languages/dockerfile/dockerfile.test.ts b/src/languages/definitions/dockerfile/dockerfile.test.ts similarity index 100% rename from src/basic-languages/dockerfile/dockerfile.test.ts rename to src/languages/definitions/dockerfile/dockerfile.test.ts diff --git a/src/basic-languages/dockerfile/dockerfile.ts b/src/languages/definitions/dockerfile/dockerfile.ts similarity index 98% rename from src/basic-languages/dockerfile/dockerfile.ts rename to src/languages/definitions/dockerfile/dockerfile.ts index 1865aaa9..0842d9ac 100644 --- a/src/basic-languages/dockerfile/dockerfile.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { brackets: [ diff --git a/src/basic-languages/dockerfile/dockerfile.contribution.ts b/src/languages/definitions/dockerfile/register.ts similarity index 100% rename from src/basic-languages/dockerfile/dockerfile.contribution.ts rename to src/languages/definitions/dockerfile/register.ts diff --git a/src/basic-languages/ecl/ecl.test.ts b/src/languages/definitions/ecl/ecl.test.ts similarity index 100% rename from src/basic-languages/ecl/ecl.test.ts rename to src/languages/definitions/ecl/ecl.test.ts diff --git a/src/basic-languages/ecl/ecl.ts b/src/languages/definitions/ecl/ecl.ts similarity index 99% rename from src/basic-languages/ecl/ecl.ts rename to src/languages/definitions/ecl/ecl.ts index 91e55ec6..8b1b28b5 100644 --- a/src/basic-languages/ecl/ecl.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/ecl/ecl.contribution.ts b/src/languages/definitions/ecl/register.ts similarity index 100% rename from src/basic-languages/ecl/ecl.contribution.ts rename to src/languages/definitions/ecl/register.ts diff --git a/src/basic-languages/elixir/elixir.test.ts b/src/languages/definitions/elixir/elixir.test.ts similarity index 100% rename from src/basic-languages/elixir/elixir.test.ts rename to src/languages/definitions/elixir/elixir.test.ts diff --git a/src/basic-languages/elixir/elixir.ts b/src/languages/definitions/elixir/elixir.ts similarity index 99% rename from src/basic-languages/elixir/elixir.ts rename to src/languages/definitions/elixir/elixir.ts index 2dd4a437..fcbe7863 100644 --- a/src/basic-languages/elixir/elixir.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/elixir/elixir.contribution.ts b/src/languages/definitions/elixir/register.ts similarity index 100% rename from src/basic-languages/elixir/elixir.contribution.ts rename to src/languages/definitions/elixir/register.ts diff --git a/src/basic-languages/flow9/flow9.test.ts b/src/languages/definitions/flow9/flow9.test.ts similarity index 100% rename from src/basic-languages/flow9/flow9.test.ts rename to src/languages/definitions/flow9/flow9.test.ts diff --git a/src/basic-languages/flow9/flow9.ts b/src/languages/definitions/flow9/flow9.ts similarity index 98% rename from src/basic-languages/flow9/flow9.ts rename to src/languages/definitions/flow9/flow9.ts index 2bd4b8df..64b48751 100644 --- a/src/basic-languages/flow9/flow9.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/flow9/flow9.contribution.ts b/src/languages/definitions/flow9/register.ts similarity index 100% rename from src/basic-languages/flow9/flow9.contribution.ts rename to src/languages/definitions/flow9/register.ts diff --git a/src/basic-languages/freemarker2/freemarker2-angle-bracket.test.ts b/src/languages/definitions/freemarker2/freemarker2-angle-bracket.test.ts similarity index 100% rename from src/basic-languages/freemarker2/freemarker2-angle-bracket.test.ts rename to src/languages/definitions/freemarker2/freemarker2-angle-bracket.test.ts diff --git a/src/basic-languages/freemarker2/freemarker2-angle-dollar.test.ts b/src/languages/definitions/freemarker2/freemarker2-angle-dollar.test.ts similarity index 100% rename from src/basic-languages/freemarker2/freemarker2-angle-dollar.test.ts rename to src/languages/definitions/freemarker2/freemarker2-angle-dollar.test.ts diff --git a/src/basic-languages/freemarker2/freemarker2-auto-bracket.test.ts b/src/languages/definitions/freemarker2/freemarker2-auto-bracket.test.ts similarity index 100% rename from src/basic-languages/freemarker2/freemarker2-auto-bracket.test.ts rename to src/languages/definitions/freemarker2/freemarker2-auto-bracket.test.ts diff --git a/src/basic-languages/freemarker2/freemarker2-auto-dollar.test.ts b/src/languages/definitions/freemarker2/freemarker2-auto-dollar.test.ts similarity index 100% rename from src/basic-languages/freemarker2/freemarker2-auto-dollar.test.ts rename to src/languages/definitions/freemarker2/freemarker2-auto-dollar.test.ts diff --git a/src/basic-languages/freemarker2/freemarker2-bracket-bracket.test.ts b/src/languages/definitions/freemarker2/freemarker2-bracket-bracket.test.ts similarity index 100% rename from src/basic-languages/freemarker2/freemarker2-bracket-bracket.test.ts rename to src/languages/definitions/freemarker2/freemarker2-bracket-bracket.test.ts diff --git a/src/basic-languages/freemarker2/freemarker2-bracket-dollar.test.ts b/src/languages/definitions/freemarker2/freemarker2-bracket-dollar.test.ts similarity index 100% rename from src/basic-languages/freemarker2/freemarker2-bracket-dollar.test.ts rename to src/languages/definitions/freemarker2/freemarker2-bracket-dollar.test.ts diff --git a/src/basic-languages/freemarker2/freemarker2.ts b/src/languages/definitions/freemarker2/freemarker2.ts similarity index 93% rename from src/basic-languages/freemarker2/freemarker2.ts rename to src/languages/definitions/freemarker2/freemarker2.ts index 0b4c0036..d19bcd40 100644 --- a/src/basic-languages/freemarker2/freemarker2.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import { languages } from '../../../editor'; // Difficulty: "Black hole!" /* @@ -206,8 +206,7 @@ function createLangConfiguration(ts: TagSyntax): languages.LanguageConfiguration folding: { markers: { start: new RegExp( - `${ts.open}#(?:${BLOCK_ELEMENTS.join('|')})([^/${ts.close}]*(?!/)${ts.close})[^${ - ts.open + `${ts.open}#(?:${BLOCK_ELEMENTS.join('|')})([^/${ts.close}]*(?!/)${ts.close})[^${ts.open }]*$` ), end: new RegExp(`${ts.open}/#(?:${BLOCK_ELEMENTS.join('|')})[\\r\\n\\t ]*>`) @@ -216,8 +215,7 @@ function createLangConfiguration(ts: TagSyntax): languages.LanguageConfiguration onEnterRules: [ { beforeText: new RegExp( - `${ts.open}#(?!(?:${EMPTY_ELEMENTS.join('|')}))([a-zA-Z_]+)([^/${ts.close}]*(?!/)${ - ts.close + `${ts.open}#(?!(?:${EMPTY_ELEMENTS.join('|')}))([a-zA-Z_]+)([^/${ts.close}]*(?!/)${ts.close })[^${ts.open}]*$` ), afterText: new RegExp(`^${ts.open}/#([a-zA-Z_]+)[\\r\\n\\t ]*${ts.close}$`), @@ -227,8 +225,7 @@ function createLangConfiguration(ts: TagSyntax): languages.LanguageConfiguration }, { beforeText: new RegExp( - `${ts.open}#(?!(?:${EMPTY_ELEMENTS.join('|')}))([a-zA-Z_]+)([^/${ts.close}]*(?!/)${ - ts.close + `${ts.open}#(?!(?:${EMPTY_ELEMENTS.join('|')}))([a-zA-Z_]+)([^/${ts.close}]*(?!/)${ts.close })[^${ts.open}]*$` ), action: { indentAction: languages.IndentAction.Indent } @@ -599,23 +596,23 @@ function createMonarchLanguage(ts: TagSyntax, is: InterpolationSyntax): language r(/(?:@startTag__id__)(@directiveStartCloseTag1)(?:@closeTag1__id__)/), ts.id === 'auto' ? { - cases: { - '$1==<': { token: '@rematch', switchTo: `@default_angle_${is.id}` }, - '$1==[': { token: '@rematch', switchTo: `@default_bracket_${is.id}` } - } - } + cases: { + '$1==<': { token: '@rematch', switchTo: `@default_angle_${is.id}` }, + '$1==[': { token: '@rematch', switchTo: `@default_bracket_${is.id}` } + } + } : [ - { token: '@brackets.directive' }, - { token: 'delimiter.directive' }, - { - cases: { - '@noParseTags': { token: 'tag', next: s('@noParse__id__.$3') }, - '@default': { token: 'tag' } - } - }, - { token: 'delimiter.directive' }, - { token: '@brackets.directive' } - ] + { token: '@brackets.directive' }, + { token: 'delimiter.directive' }, + { + cases: { + '@noParseTags': { token: 'tag', next: s('@noParse__id__.$3') }, + '@default': { token: 'tag' } + } + }, + { token: 'delimiter.directive' }, + { token: '@brackets.directive' } + ] ], // "else" > { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); } @@ -636,18 +633,18 @@ function createMonarchLanguage(ts: TagSyntax, is: InterpolationSyntax): language r(/(?:@startTag__id__)(@directiveStartCloseTag2)(?:@closeTag2__id__)/), ts.id === 'auto' ? { - cases: { - '$1==<': { token: '@rematch', switchTo: `@default_angle_${is.id}` }, - '$1==[': { token: '@rematch', switchTo: `@default_bracket_${is.id}` } - } - } + cases: { + '$1==<': { token: '@rematch', switchTo: `@default_angle_${is.id}` }, + '$1==[': { token: '@rematch', switchTo: `@default_bracket_${is.id}` } + } + } : [ - { token: '@brackets.directive' }, - { token: 'delimiter.directive' }, - { token: 'tag' }, - { token: 'delimiter.directive' }, - { token: '@brackets.directive' } - ] + { token: '@brackets.directive' }, + { token: 'delimiter.directive' }, + { token: 'tag' }, + { token: 'delimiter.directive' }, + { token: '@brackets.directive' } + ] ], // "if" > { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); } @@ -693,17 +690,17 @@ function createMonarchLanguage(ts: TagSyntax, is: InterpolationSyntax): language r(/(?:@startTag__id__)(@directiveStartBlank)(@blank)/), ts.id === 'auto' ? { - cases: { - '$1==<': { token: '@rematch', switchTo: `@default_angle_${is.id}` }, - '$1==[': { token: '@rematch', switchTo: `@default_bracket_${is.id}` } - } - } + cases: { + '$1==<': { token: '@rematch', switchTo: `@default_angle_${is.id}` }, + '$1==[': { token: '@rematch', switchTo: `@default_bracket_${is.id}` } + } + } : [ - { token: '@brackets.directive' }, - { token: 'delimiter.directive' }, - { token: 'tag' }, - { token: '', next: s('@fmExpression__id__.directive') } - ] + { token: '@brackets.directive' }, + { token: 'delimiter.directive' }, + { token: 'tag' }, + { token: '', next: s('@fmExpression__id__.directive') } + ] ], // "if" > { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); } @@ -739,18 +736,18 @@ function createMonarchLanguage(ts: TagSyntax, is: InterpolationSyntax): language r(/(?:@endTag__id__)(@directiveEndCloseTag1)(?:@closeTag1__id__)/), ts.id === 'auto' ? { - cases: { - '$1==<': { token: '@rematch', switchTo: `@default_angle_${is.id}` }, - '$1==[': { token: '@rematch', switchTo: `@default_bracket_${is.id}` } - } - } + cases: { + '$1==<': { token: '@rematch', switchTo: `@default_angle_${is.id}` }, + '$1==[': { token: '@rematch', switchTo: `@default_bracket_${is.id}` } + } + } : [ - { token: '@brackets.directive' }, - { token: 'delimiter.directive' }, - { token: 'tag' }, - { token: 'delimiter.directive' }, - { token: '@brackets.directive' } - ] + { token: '@brackets.directive' }, + { token: 'delimiter.directive' }, + { token: 'tag' }, + { token: 'delimiter.directive' }, + { token: '@brackets.directive' } + ] ], // { unifiedCall(matchedToken); } @@ -758,15 +755,15 @@ function createMonarchLanguage(ts: TagSyntax, is: InterpolationSyntax): language r(/(@open__id__)(@)/), ts.id === 'auto' ? { - cases: { - '$1==<': { token: '@rematch', switchTo: `@default_angle_${is.id}` }, - '$1==[': { token: '@rematch', switchTo: `@default_bracket_${is.id}` } - } - } + cases: { + '$1==<': { token: '@rematch', switchTo: `@default_angle_${is.id}` }, + '$1==[': { token: '@rematch', switchTo: `@default_bracket_${is.id}` } + } + } : [ - { token: '@brackets.directive' }, - { token: 'delimiter.directive', next: s('@unifiedCall__id__') } - ] + { token: '@brackets.directive' }, + { token: 'delimiter.directive', next: s('@unifiedCall__id__') } + ] ], // ) (".")*)? > { unifiedCallEnd(matchedToken); } @@ -786,11 +783,11 @@ function createMonarchLanguage(ts: TagSyntax, is: InterpolationSyntax): language r(/(@open__id__)#--/), ts.id === 'auto' ? { - cases: { - '$1==<': { token: '@rematch', switchTo: `@default_angle_${is.id}` }, - '$1==[': { token: '@rematch', switchTo: `@default_bracket_${is.id}` } - } - } + cases: { + '$1==<': { token: '@rematch', switchTo: `@default_angle_${is.id}` }, + '$1==[': { token: '@rematch', switchTo: `@default_bracket_${is.id}` } + } + } : { token: 'comment', next: s('@terseComment__id__') } ], @@ -799,16 +796,16 @@ function createMonarchLanguage(ts: TagSyntax, is: InterpolationSyntax): language r(/(?:@startOrEndTag__id__)([a-zA-Z_]+)/), ts.id === 'auto' ? { - cases: { - '$1==<': { token: '@rematch', switchTo: `@default_angle_${is.id}` }, - '$1==[': { token: '@rematch', switchTo: `@default_bracket_${is.id}` } - } - } + cases: { + '$1==<': { token: '@rematch', switchTo: `@default_angle_${is.id}` }, + '$1==[': { token: '@rematch', switchTo: `@default_bracket_${is.id}` } + } + } : [ - { token: '@brackets.directive' }, - { token: 'delimiter.directive' }, - { token: 'tag.invalid', next: s('@fmExpression__id__.directive') } - ] + { token: '@brackets.directive' }, + { token: 'delimiter.directive' }, + { token: 'tag.invalid', next: s('@fmExpression__id__.directive') } + ] ] ], @@ -952,16 +949,16 @@ function createMonarchLanguage(ts: TagSyntax, is: InterpolationSyntax): language cases: { ...(is.id === 'bracket' ? { - '$S2==interpolation': { token: '@brackets.interpolation', next: '@popall' } - } + '$S2==interpolation': { token: '@brackets.interpolation', next: '@popall' } + } : {}), // This cannot happen while in auto mode, since this applies only to an // fmExpression inside a directive. But once we encounter the start of a // directive, we can establish the tag syntax mode. ...(ts.id === 'bracket' ? { - '$S2==directive': { token: '@brackets.directive', next: '@popall' } - } + '$S2==directive': { token: '@brackets.directive', next: '@popall' } + } : {}), // Ignore mismatched paren [s('$S1==inParen__id__')]: { token: '@brackets', next: '@pop' }, @@ -986,8 +983,8 @@ function createMonarchLanguage(ts: TagSyntax, is: InterpolationSyntax): language ...(is.id === 'bracket' ? {} : { - '$S2==interpolation': { token: '@brackets.interpolation', next: '@popall' } - }), + '$S2==interpolation': { token: '@brackets.interpolation', next: '@popall' } + }), // Ignore mismatched paren [s('$S1==inParen__id__')]: { token: '@brackets', next: '@pop' }, '@default': { token: '@brackets' } diff --git a/src/basic-languages/freemarker2/freemarker2.contribution.ts b/src/languages/definitions/freemarker2/register.ts similarity index 100% rename from src/basic-languages/freemarker2/freemarker2.contribution.ts rename to src/languages/definitions/freemarker2/register.ts diff --git a/src/basic-languages/fsharp/fsharp.test.ts b/src/languages/definitions/fsharp/fsharp.test.ts similarity index 100% rename from src/basic-languages/fsharp/fsharp.test.ts rename to src/languages/definitions/fsharp/fsharp.test.ts diff --git a/src/basic-languages/fsharp/fsharp.ts b/src/languages/definitions/fsharp/fsharp.ts similarity index 98% rename from src/basic-languages/fsharp/fsharp.ts rename to src/languages/definitions/fsharp/fsharp.ts index d8def180..4278a628 100644 --- a/src/basic-languages/fsharp/fsharp.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/fsharp/fsharp.contribution.ts b/src/languages/definitions/fsharp/register.ts similarity index 100% rename from src/basic-languages/fsharp/fsharp.contribution.ts rename to src/languages/definitions/fsharp/register.ts diff --git a/src/basic-languages/go/go.test.ts b/src/languages/definitions/go/go.test.ts similarity index 100% rename from src/basic-languages/go/go.test.ts rename to src/languages/definitions/go/go.test.ts diff --git a/src/basic-languages/go/go.ts b/src/languages/definitions/go/go.ts similarity index 98% rename from src/basic-languages/go/go.ts rename to src/languages/definitions/go/go.ts index 4f644957..03a7a0f4 100644 --- a/src/basic-languages/go/go.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/go/go.contribution.ts b/src/languages/definitions/go/register.ts similarity index 100% rename from src/basic-languages/go/go.contribution.ts rename to src/languages/definitions/go/register.ts diff --git a/src/basic-languages/graphql/graphql.test.ts b/src/languages/definitions/graphql/graphql.test.ts similarity index 100% rename from src/basic-languages/graphql/graphql.test.ts rename to src/languages/definitions/graphql/graphql.test.ts diff --git a/src/basic-languages/graphql/graphql.ts b/src/languages/definitions/graphql/graphql.ts similarity index 98% rename from src/basic-languages/graphql/graphql.ts rename to src/languages/definitions/graphql/graphql.ts index 62ecc5fa..8756431a 100644 --- a/src/basic-languages/graphql/graphql.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/graphql/graphql.contribution.ts b/src/languages/definitions/graphql/register.ts similarity index 100% rename from src/basic-languages/graphql/graphql.contribution.ts rename to src/languages/definitions/graphql/register.ts diff --git a/src/basic-languages/handlebars/handlebars.test.ts b/src/languages/definitions/handlebars/handlebars.test.ts similarity index 100% rename from src/basic-languages/handlebars/handlebars.test.ts rename to src/languages/definitions/handlebars/handlebars.test.ts diff --git a/src/basic-languages/handlebars/handlebars.ts b/src/languages/definitions/handlebars/handlebars.ts similarity index 99% rename from src/basic-languages/handlebars/handlebars.ts rename to src/languages/definitions/handlebars/handlebars.ts index 07ccfe44..05ce40d2 100644 --- a/src/basic-languages/handlebars/handlebars.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import { languages } from '../../../editor'; const EMPTY_ELEMENTS: string[] = [ 'area', diff --git a/src/basic-languages/handlebars/handlebars.contribution.ts b/src/languages/definitions/handlebars/register.ts similarity index 100% rename from src/basic-languages/handlebars/handlebars.contribution.ts rename to src/languages/definitions/handlebars/register.ts diff --git a/src/basic-languages/hcl/hcl.test.ts b/src/languages/definitions/hcl/hcl.test.ts similarity index 100% rename from src/basic-languages/hcl/hcl.test.ts rename to src/languages/definitions/hcl/hcl.test.ts diff --git a/src/basic-languages/hcl/hcl.ts b/src/languages/definitions/hcl/hcl.ts similarity index 98% rename from src/basic-languages/hcl/hcl.ts rename to src/languages/definitions/hcl/hcl.ts index fa3ec0c8..74cfd70f 100644 --- a/src/basic-languages/hcl/hcl.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/hcl/hcl.contribution.ts b/src/languages/definitions/hcl/register.ts similarity index 100% rename from src/basic-languages/hcl/hcl.contribution.ts rename to src/languages/definitions/hcl/register.ts diff --git a/src/basic-languages/html/html.test.ts b/src/languages/definitions/html/html.test.ts similarity index 100% rename from src/basic-languages/html/html.test.ts rename to src/languages/definitions/html/html.test.ts diff --git a/src/basic-languages/html/html.ts b/src/languages/definitions/html/html.ts similarity index 99% rename from src/basic-languages/html/html.ts rename to src/languages/definitions/html/html.ts index 4456eaf5..3ad46928 100644 --- a/src/basic-languages/html/html.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import { languages } from '../../../editor'; const EMPTY_ELEMENTS: string[] = [ 'area', diff --git a/src/basic-languages/html/html.contribution.ts b/src/languages/definitions/html/register.ts similarity index 100% rename from src/basic-languages/html/html.contribution.ts rename to src/languages/definitions/html/register.ts diff --git a/src/basic-languages/ini/ini.ts b/src/languages/definitions/ini/ini.ts similarity index 97% rename from src/basic-languages/ini/ini.ts rename to src/languages/definitions/ini/ini.ts index 2cc01789..9c9bffe0 100644 --- a/src/basic-languages/ini/ini.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/ini/ini.contribution.ts b/src/languages/definitions/ini/register.ts similarity index 100% rename from src/basic-languages/ini/ini.contribution.ts rename to src/languages/definitions/ini/register.ts diff --git a/src/basic-languages/java/java.test.ts b/src/languages/definitions/java/java.test.ts similarity index 100% rename from src/basic-languages/java/java.test.ts rename to src/languages/definitions/java/java.test.ts diff --git a/src/basic-languages/java/java.ts b/src/languages/definitions/java/java.ts similarity index 98% rename from src/basic-languages/java/java.ts rename to src/languages/definitions/java/java.ts index 7ee78e84..c791ed7a 100644 --- a/src/basic-languages/java/java.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { // the default separators except `@$` diff --git a/src/basic-languages/java/java.contribution.ts b/src/languages/definitions/java/register.ts similarity index 100% rename from src/basic-languages/java/java.contribution.ts rename to src/languages/definitions/java/register.ts diff --git a/src/basic-languages/javascript/javascript.test.ts b/src/languages/definitions/javascript/javascript.test.ts similarity index 100% rename from src/basic-languages/javascript/javascript.test.ts rename to src/languages/definitions/javascript/javascript.test.ts diff --git a/src/basic-languages/javascript/javascript.ts b/src/languages/definitions/javascript/javascript.ts similarity index 96% rename from src/basic-languages/javascript/javascript.ts rename to src/languages/definitions/javascript/javascript.ts index 9d5b85c6..981bac6c 100644 --- a/src/basic-languages/javascript/javascript.ts +++ b/src/languages/definitions/javascript/javascript.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { conf as tsConf, language as tsLanguage } from '../typescript/typescript'; -import type { languages } from 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = tsConf; diff --git a/src/basic-languages/javascript/javascript.contribution.ts b/src/languages/definitions/javascript/register.ts similarity index 100% rename from src/basic-languages/javascript/javascript.contribution.ts rename to src/languages/definitions/javascript/register.ts diff --git a/src/basic-languages/julia/julia.test.ts b/src/languages/definitions/julia/julia.test.ts similarity index 100% rename from src/basic-languages/julia/julia.test.ts rename to src/languages/definitions/julia/julia.test.ts diff --git a/src/basic-languages/julia/julia.ts b/src/languages/definitions/julia/julia.ts similarity index 99% rename from src/basic-languages/julia/julia.ts rename to src/languages/definitions/julia/julia.ts index 4816c110..f690386e 100644 --- a/src/basic-languages/julia/julia.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { brackets: [ diff --git a/src/basic-languages/julia/julia.contribution.ts b/src/languages/definitions/julia/register.ts similarity index 100% rename from src/basic-languages/julia/julia.contribution.ts rename to src/languages/definitions/julia/register.ts diff --git a/src/basic-languages/kotlin/kotlin.test.ts b/src/languages/definitions/kotlin/kotlin.test.ts similarity index 100% rename from src/basic-languages/kotlin/kotlin.test.ts rename to src/languages/definitions/kotlin/kotlin.test.ts diff --git a/src/basic-languages/kotlin/kotlin.ts b/src/languages/definitions/kotlin/kotlin.ts similarity index 98% rename from src/basic-languages/kotlin/kotlin.ts rename to src/languages/definitions/kotlin/kotlin.ts index 01643b5c..7f7b2bda 100644 --- a/src/basic-languages/kotlin/kotlin.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { // the default separators except `@$` diff --git a/src/basic-languages/kotlin/kotlin.contribution.ts b/src/languages/definitions/kotlin/register.ts similarity index 100% rename from src/basic-languages/kotlin/kotlin.contribution.ts rename to src/languages/definitions/kotlin/register.ts diff --git a/src/basic-languages/less/less.test.ts b/src/languages/definitions/less/less.test.ts similarity index 100% rename from src/basic-languages/less/less.test.ts rename to src/languages/definitions/less/less.test.ts diff --git a/src/basic-languages/less/less.ts b/src/languages/definitions/less/less.ts similarity index 98% rename from src/basic-languages/less/less.ts rename to src/languages/definitions/less/less.ts index 98fa7530..fbb221ef 100644 --- a/src/basic-languages/less/less.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { wordPattern: /(#?-?\d*\.\d\w*%?)|([@#!.:]?[\w-?]+%?)|[@#!.]/g, diff --git a/src/basic-languages/less/less.contribution.ts b/src/languages/definitions/less/register.ts similarity index 100% rename from src/basic-languages/less/less.contribution.ts rename to src/languages/definitions/less/register.ts diff --git a/src/basic-languages/lexon/lexon.test.ts b/src/languages/definitions/lexon/lexon.test.ts similarity index 100% rename from src/basic-languages/lexon/lexon.test.ts rename to src/languages/definitions/lexon/lexon.test.ts diff --git a/src/basic-languages/lexon/lexon.ts b/src/languages/definitions/lexon/lexon.ts similarity index 98% rename from src/basic-languages/lexon/lexon.ts rename to src/languages/definitions/lexon/lexon.ts index 0475ab76..b67797eb 100644 --- a/src/basic-languages/lexon/lexon.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/lexon/lexon.contribution.ts b/src/languages/definitions/lexon/register.ts similarity index 100% rename from src/basic-languages/lexon/lexon.contribution.ts rename to src/languages/definitions/lexon/register.ts diff --git a/src/basic-languages/liquid/liquid.test.ts b/src/languages/definitions/liquid/liquid.test.ts similarity index 100% rename from src/basic-languages/liquid/liquid.test.ts rename to src/languages/definitions/liquid/liquid.test.ts diff --git a/src/basic-languages/liquid/liquid.ts b/src/languages/definitions/liquid/liquid.ts similarity index 99% rename from src/basic-languages/liquid/liquid.ts rename to src/languages/definitions/liquid/liquid.ts index 17ad671e..d0d87a8c 100644 --- a/src/basic-languages/liquid/liquid.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import { languages } from '../../../editor'; const EMPTY_ELEMENTS: string[] = [ 'area', diff --git a/src/basic-languages/liquid/liquid.contribution.ts b/src/languages/definitions/liquid/register.ts similarity index 100% rename from src/basic-languages/liquid/liquid.contribution.ts rename to src/languages/definitions/liquid/register.ts diff --git a/src/basic-languages/lua/lua.test.ts b/src/languages/definitions/lua/lua.test.ts similarity index 100% rename from src/basic-languages/lua/lua.test.ts rename to src/languages/definitions/lua/lua.test.ts diff --git a/src/basic-languages/lua/lua.ts b/src/languages/definitions/lua/lua.ts similarity index 98% rename from src/basic-languages/lua/lua.ts rename to src/languages/definitions/lua/lua.ts index 0d443173..2d8de0cc 100644 --- a/src/basic-languages/lua/lua.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/lua/lua.contribution.ts b/src/languages/definitions/lua/register.ts similarity index 100% rename from src/basic-languages/lua/lua.contribution.ts rename to src/languages/definitions/lua/register.ts diff --git a/src/basic-languages/m3/m3.test.ts b/src/languages/definitions/m3/m3.test.ts similarity index 100% rename from src/basic-languages/m3/m3.test.ts rename to src/languages/definitions/m3/m3.test.ts diff --git a/src/basic-languages/m3/m3.ts b/src/languages/definitions/m3/m3.ts similarity index 98% rename from src/basic-languages/m3/m3.ts rename to src/languages/definitions/m3/m3.ts index f3f55353..b74363ed 100644 --- a/src/basic-languages/m3/m3.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/m3/m3.contribution.ts b/src/languages/definitions/m3/register.ts similarity index 100% rename from src/basic-languages/m3/m3.contribution.ts rename to src/languages/definitions/m3/register.ts diff --git a/src/basic-languages/markdown/markdown.test.ts b/src/languages/definitions/markdown/markdown.test.ts similarity index 100% rename from src/basic-languages/markdown/markdown.test.ts rename to src/languages/definitions/markdown/markdown.test.ts diff --git a/src/basic-languages/markdown/markdown.ts b/src/languages/definitions/markdown/markdown.ts similarity index 99% rename from src/basic-languages/markdown/markdown.ts rename to src/languages/definitions/markdown/markdown.ts index 059f0417..dbdb935b 100644 --- a/src/basic-languages/markdown/markdown.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/markdown/markdown.contribution.ts b/src/languages/definitions/markdown/register.ts similarity index 100% rename from src/basic-languages/markdown/markdown.contribution.ts rename to src/languages/definitions/markdown/register.ts diff --git a/src/basic-languages/mdx/mdx.test.ts b/src/languages/definitions/mdx/mdx.test.ts similarity index 100% rename from src/basic-languages/mdx/mdx.test.ts rename to src/languages/definitions/mdx/mdx.test.ts diff --git a/src/basic-languages/mdx/mdx.ts b/src/languages/definitions/mdx/mdx.ts similarity index 99% rename from src/basic-languages/mdx/mdx.ts rename to src/languages/definitions/mdx/mdx.ts index 7045cbb5..8f213a84 100644 --- a/src/basic-languages/mdx/mdx.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/mdx/mdx.contribution.ts b/src/languages/definitions/mdx/register.ts similarity index 100% rename from src/basic-languages/mdx/mdx.contribution.ts rename to src/languages/definitions/mdx/register.ts diff --git a/src/basic-languages/mips/mips.test.ts b/src/languages/definitions/mips/mips.test.ts similarity index 100% rename from src/basic-languages/mips/mips.test.ts rename to src/languages/definitions/mips/mips.test.ts diff --git a/src/basic-languages/mips/mips.ts b/src/languages/definitions/mips/mips.ts similarity index 98% rename from src/basic-languages/mips/mips.ts rename to src/languages/definitions/mips/mips.ts index 06b46cda..67d829bf 100644 --- a/src/basic-languages/mips/mips.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { wordPattern: diff --git a/src/basic-languages/mips/mips.contribution.ts b/src/languages/definitions/mips/register.ts similarity index 100% rename from src/basic-languages/mips/mips.contribution.ts rename to src/languages/definitions/mips/register.ts diff --git a/src/basic-languages/msdax/msdax.test.ts b/src/languages/definitions/msdax/msdax.test.ts similarity index 100% rename from src/basic-languages/msdax/msdax.test.ts rename to src/languages/definitions/msdax/msdax.test.ts diff --git a/src/basic-languages/msdax/msdax.ts b/src/languages/definitions/msdax/msdax.ts similarity index 99% rename from src/basic-languages/msdax/msdax.ts rename to src/languages/definitions/msdax/msdax.ts index 6b1f6841..0edef521 100644 --- a/src/basic-languages/msdax/msdax.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/msdax/msdax.contribution.ts b/src/languages/definitions/msdax/register.ts similarity index 100% rename from src/basic-languages/msdax/msdax.contribution.ts rename to src/languages/definitions/msdax/register.ts diff --git a/src/basic-languages/mysql/keywords.js b/src/languages/definitions/mysql/keywords.js similarity index 100% rename from src/basic-languages/mysql/keywords.js rename to src/languages/definitions/mysql/keywords.js diff --git a/src/basic-languages/mysql/keywords.mysql.txt b/src/languages/definitions/mysql/keywords.mysql.txt similarity index 100% rename from src/basic-languages/mysql/keywords.mysql.txt rename to src/languages/definitions/mysql/keywords.mysql.txt diff --git a/src/basic-languages/mysql/mysql.test.ts b/src/languages/definitions/mysql/mysql.test.ts similarity index 100% rename from src/basic-languages/mysql/mysql.test.ts rename to src/languages/definitions/mysql/mysql.test.ts diff --git a/src/basic-languages/mysql/mysql.ts b/src/languages/definitions/mysql/mysql.ts similarity index 99% rename from src/basic-languages/mysql/mysql.ts rename to src/languages/definitions/mysql/mysql.ts index 5e60e6cf..73d00f90 100644 --- a/src/basic-languages/mysql/mysql.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/mysql/mysql.contribution.ts b/src/languages/definitions/mysql/register.ts similarity index 100% rename from src/basic-languages/mysql/mysql.contribution.ts rename to src/languages/definitions/mysql/register.ts diff --git a/src/basic-languages/objective-c/objective-c.test.ts b/src/languages/definitions/objective-c/objective-c.test.ts similarity index 100% rename from src/basic-languages/objective-c/objective-c.test.ts rename to src/languages/definitions/objective-c/objective-c.test.ts diff --git a/src/basic-languages/objective-c/objective-c.ts b/src/languages/definitions/objective-c/objective-c.ts similarity index 98% rename from src/basic-languages/objective-c/objective-c.ts rename to src/languages/definitions/objective-c/objective-c.ts index e7e3e301..e28de1a7 100644 --- a/src/basic-languages/objective-c/objective-c.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/objective-c/objective-c.contribution.ts b/src/languages/definitions/objective-c/register.ts similarity index 100% rename from src/basic-languages/objective-c/objective-c.contribution.ts rename to src/languages/definitions/objective-c/register.ts diff --git a/src/basic-languages/pascal/pascal.test.ts b/src/languages/definitions/pascal/pascal.test.ts similarity index 100% rename from src/basic-languages/pascal/pascal.test.ts rename to src/languages/definitions/pascal/pascal.test.ts diff --git a/src/basic-languages/pascal/pascal.ts b/src/languages/definitions/pascal/pascal.ts similarity index 98% rename from src/basic-languages/pascal/pascal.ts rename to src/languages/definitions/pascal/pascal.ts index e76dd81d..3d568bea 100644 --- a/src/basic-languages/pascal/pascal.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { // the default separators except `@$` diff --git a/src/basic-languages/pascal/pascal.contribution.ts b/src/languages/definitions/pascal/register.ts similarity index 100% rename from src/basic-languages/pascal/pascal.contribution.ts rename to src/languages/definitions/pascal/register.ts diff --git a/src/basic-languages/pascaligo/pascaligo.test.ts b/src/languages/definitions/pascaligo/pascaligo.test.ts similarity index 100% rename from src/basic-languages/pascaligo/pascaligo.test.ts rename to src/languages/definitions/pascaligo/pascaligo.test.ts diff --git a/src/basic-languages/pascaligo/pascaligo.ts b/src/languages/definitions/pascaligo/pascaligo.ts similarity index 98% rename from src/basic-languages/pascaligo/pascaligo.ts rename to src/languages/definitions/pascaligo/pascaligo.ts index f0cff792..8f92e233 100644 --- a/src/basic-languages/pascaligo/pascaligo.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/pascaligo/pascaligo.contribution.ts b/src/languages/definitions/pascaligo/register.ts similarity index 100% rename from src/basic-languages/pascaligo/pascaligo.contribution.ts rename to src/languages/definitions/pascaligo/register.ts diff --git a/src/basic-languages/perl/perl.test.ts b/src/languages/definitions/perl/perl.test.ts similarity index 100% rename from src/basic-languages/perl/perl.test.ts rename to src/languages/definitions/perl/perl.test.ts diff --git a/src/basic-languages/perl/perl.ts b/src/languages/definitions/perl/perl.ts similarity index 99% rename from src/basic-languages/perl/perl.ts rename to src/languages/definitions/perl/perl.ts index 5ba3bd06..5e9e8681 100644 --- a/src/basic-languages/perl/perl.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/perl/perl.contribution.ts b/src/languages/definitions/perl/register.ts similarity index 100% rename from src/basic-languages/perl/perl.contribution.ts rename to src/languages/definitions/perl/register.ts diff --git a/src/basic-languages/pgsql/keywords.js b/src/languages/definitions/pgsql/keywords.js similarity index 100% rename from src/basic-languages/pgsql/keywords.js rename to src/languages/definitions/pgsql/keywords.js diff --git a/src/basic-languages/pgsql/keywords.postgresql.txt b/src/languages/definitions/pgsql/keywords.postgresql.txt similarity index 100% rename from src/basic-languages/pgsql/keywords.postgresql.txt rename to src/languages/definitions/pgsql/keywords.postgresql.txt diff --git a/src/basic-languages/pgsql/pgsql.test.ts b/src/languages/definitions/pgsql/pgsql.test.ts similarity index 100% rename from src/basic-languages/pgsql/pgsql.test.ts rename to src/languages/definitions/pgsql/pgsql.test.ts diff --git a/src/basic-languages/pgsql/pgsql.ts b/src/languages/definitions/pgsql/pgsql.ts similarity index 99% rename from src/basic-languages/pgsql/pgsql.ts rename to src/languages/definitions/pgsql/pgsql.ts index 00137b13..3188e400 100644 --- a/src/basic-languages/pgsql/pgsql.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/pgsql/pgsql.contribution.ts b/src/languages/definitions/pgsql/register.ts similarity index 100% rename from src/basic-languages/pgsql/pgsql.contribution.ts rename to src/languages/definitions/pgsql/register.ts diff --git a/src/basic-languages/php/php.test.ts b/src/languages/definitions/php/php.test.ts similarity index 100% rename from src/basic-languages/php/php.test.ts rename to src/languages/definitions/php/php.test.ts diff --git a/src/basic-languages/php/php.ts b/src/languages/definitions/php/php.ts similarity index 99% rename from src/basic-languages/php/php.ts rename to src/languages/definitions/php/php.ts index 2f10416c..83fb08e2 100644 --- a/src/basic-languages/php/php.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { wordPattern: diff --git a/src/basic-languages/php/php.contribution.ts b/src/languages/definitions/php/register.ts similarity index 100% rename from src/basic-languages/php/php.contribution.ts rename to src/languages/definitions/php/register.ts diff --git a/src/basic-languages/pla/pla.test.ts b/src/languages/definitions/pla/pla.test.ts similarity index 100% rename from src/basic-languages/pla/pla.test.ts rename to src/languages/definitions/pla/pla.test.ts diff --git a/src/basic-languages/pla/pla.ts b/src/languages/definitions/pla/pla.ts similarity index 98% rename from src/basic-languages/pla/pla.ts rename to src/languages/definitions/pla/pla.ts index b3e8f395..dabb3e2c 100644 --- a/src/basic-languages/pla/pla.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/pla/pla.contribution.ts b/src/languages/definitions/pla/register.ts similarity index 100% rename from src/basic-languages/pla/pla.contribution.ts rename to src/languages/definitions/pla/register.ts diff --git a/src/basic-languages/postiats/postiats.test.ts b/src/languages/definitions/postiats/postiats.test.ts similarity index 100% rename from src/basic-languages/postiats/postiats.test.ts rename to src/languages/definitions/postiats/postiats.test.ts diff --git a/src/basic-languages/postiats/postiats.ts b/src/languages/definitions/postiats/postiats.ts similarity index 99% rename from src/basic-languages/postiats/postiats.ts rename to src/languages/definitions/postiats/postiats.ts index db7a673b..d8982e8c 100644 --- a/src/basic-languages/postiats/postiats.ts +++ b/src/languages/definitions/postiats/postiats.ts @@ -5,7 +5,7 @@ * Based on the ATS/Postiats lexer by Hongwei Xi. *--------------------------------------------------------------------------------------------*/ -import type { languages } from 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/postiats/postiats.contribution.ts b/src/languages/definitions/postiats/register.ts similarity index 100% rename from src/basic-languages/postiats/postiats.contribution.ts rename to src/languages/definitions/postiats/register.ts diff --git a/src/basic-languages/powerquery/powerquery.test.ts b/src/languages/definitions/powerquery/powerquery.test.ts similarity index 100% rename from src/basic-languages/powerquery/powerquery.test.ts rename to src/languages/definitions/powerquery/powerquery.test.ts diff --git a/src/basic-languages/powerquery/powerquery.ts b/src/languages/definitions/powerquery/powerquery.ts similarity index 99% rename from src/basic-languages/powerquery/powerquery.ts rename to src/languages/definitions/powerquery/powerquery.ts index 2f35178e..fd674fec 100644 --- a/src/basic-languages/powerquery/powerquery.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/powerquery/powerquery.contribution.ts b/src/languages/definitions/powerquery/register.ts similarity index 100% rename from src/basic-languages/powerquery/powerquery.contribution.ts rename to src/languages/definitions/powerquery/register.ts diff --git a/src/basic-languages/powershell/powershell.test.ts b/src/languages/definitions/powershell/powershell.test.ts similarity index 100% rename from src/basic-languages/powershell/powershell.test.ts rename to src/languages/definitions/powershell/powershell.test.ts diff --git a/src/basic-languages/powershell/powershell.ts b/src/languages/definitions/powershell/powershell.ts similarity index 98% rename from src/basic-languages/powershell/powershell.ts rename to src/languages/definitions/powershell/powershell.ts index f5ee176a..3606fee3 100644 --- a/src/basic-languages/powershell/powershell.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { // the default separators except `$-` diff --git a/src/basic-languages/powershell/powershell.contribution.ts b/src/languages/definitions/powershell/register.ts similarity index 100% rename from src/basic-languages/powershell/powershell.contribution.ts rename to src/languages/definitions/powershell/register.ts diff --git a/src/basic-languages/protobuf/protobuf.test.ts b/src/languages/definitions/protobuf/protobuf.test.ts similarity index 100% rename from src/basic-languages/protobuf/protobuf.test.ts rename to src/languages/definitions/protobuf/protobuf.test.ts diff --git a/src/basic-languages/protobuf/protobuf.ts b/src/languages/definitions/protobuf/protobuf.ts similarity index 99% rename from src/basic-languages/protobuf/protobuf.ts rename to src/languages/definitions/protobuf/protobuf.ts index b0542bc5..e574052f 100644 --- a/src/basic-languages/protobuf/protobuf.ts +++ b/src/languages/definitions/protobuf/protobuf.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -import type { languages } from 'monaco-editor-core'; +import type { languages } from '../../../editor'; const namedLiterals = ['true', 'false']; diff --git a/src/basic-languages/protobuf/protobuf.contribution.ts b/src/languages/definitions/protobuf/register.ts similarity index 100% rename from src/basic-languages/protobuf/protobuf.contribution.ts rename to src/languages/definitions/protobuf/register.ts diff --git a/src/basic-languages/pug/pug.test.ts b/src/languages/definitions/pug/pug.test.ts similarity index 100% rename from src/basic-languages/pug/pug.test.ts rename to src/languages/definitions/pug/pug.test.ts diff --git a/src/basic-languages/pug/pug.ts b/src/languages/definitions/pug/pug.ts similarity index 99% rename from src/basic-languages/pug/pug.ts rename to src/languages/definitions/pug/pug.ts index 04c4970c..1c23ae48 100644 --- a/src/basic-languages/pug/pug.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/pug/pug.contribution.ts b/src/languages/definitions/pug/register.ts similarity index 100% rename from src/basic-languages/pug/pug.contribution.ts rename to src/languages/definitions/pug/register.ts diff --git a/src/basic-languages/python/python.test.ts b/src/languages/definitions/python/python.test.ts similarity index 100% rename from src/basic-languages/python/python.test.ts rename to src/languages/definitions/python/python.test.ts diff --git a/src/basic-languages/python/python.ts b/src/languages/definitions/python/python.ts similarity index 99% rename from src/basic-languages/python/python.ts rename to src/languages/definitions/python/python.ts index c48255a9..e1695489 100644 --- a/src/basic-languages/python/python.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/python/python.contribution.ts b/src/languages/definitions/python/register.ts similarity index 100% rename from src/basic-languages/python/python.contribution.ts rename to src/languages/definitions/python/register.ts diff --git a/src/basic-languages/qsharp/qsharp.test.ts b/src/languages/definitions/qsharp/qsharp.test.ts similarity index 100% rename from src/basic-languages/qsharp/qsharp.test.ts rename to src/languages/definitions/qsharp/qsharp.test.ts diff --git a/src/basic-languages/qsharp/qsharp.ts b/src/languages/definitions/qsharp/qsharp.ts similarity index 98% rename from src/basic-languages/qsharp/qsharp.ts rename to src/languages/definitions/qsharp/qsharp.ts index 8cb42ae7..7ac7d05f 100644 --- a/src/basic-languages/qsharp/qsharp.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/qsharp/qsharp.contribution.ts b/src/languages/definitions/qsharp/register.ts similarity index 100% rename from src/basic-languages/qsharp/qsharp.contribution.ts rename to src/languages/definitions/qsharp/register.ts diff --git a/src/basic-languages/r/r.test.ts b/src/languages/definitions/r/r.test.ts similarity index 100% rename from src/basic-languages/r/r.test.ts rename to src/languages/definitions/r/r.test.ts diff --git a/src/basic-languages/r/r.ts b/src/languages/definitions/r/r.ts similarity index 98% rename from src/basic-languages/r/r.ts rename to src/languages/definitions/r/r.ts index 1bbf0275..fb30c38b 100644 --- a/src/basic-languages/r/r.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/r/r.contribution.ts b/src/languages/definitions/r/register.ts similarity index 100% rename from src/basic-languages/r/r.contribution.ts rename to src/languages/definitions/r/register.ts diff --git a/src/basic-languages/razor/razor.test.ts b/src/languages/definitions/razor/razor.test.ts similarity index 100% rename from src/basic-languages/razor/razor.test.ts rename to src/languages/definitions/razor/razor.test.ts diff --git a/src/basic-languages/razor/razor.ts b/src/languages/definitions/razor/razor.ts similarity index 99% rename from src/basic-languages/razor/razor.ts rename to src/languages/definitions/razor/razor.ts index 43dc9512..3c6d8f3f 100644 --- a/src/basic-languages/razor/razor.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import { languages } from '../../../editor'; const EMPTY_ELEMENTS: string[] = [ 'area', diff --git a/src/basic-languages/razor/razor.contribution.ts b/src/languages/definitions/razor/register.ts similarity index 100% rename from src/basic-languages/razor/razor.contribution.ts rename to src/languages/definitions/razor/register.ts diff --git a/src/basic-languages/redis/redis.test.ts b/src/languages/definitions/redis/redis.test.ts similarity index 100% rename from src/basic-languages/redis/redis.test.ts rename to src/languages/definitions/redis/redis.test.ts diff --git a/src/basic-languages/redis/redis.ts b/src/languages/definitions/redis/redis.ts similarity index 98% rename from src/basic-languages/redis/redis.ts rename to src/languages/definitions/redis/redis.ts index 7fcf20f7..39f27b7f 100644 --- a/src/basic-languages/redis/redis.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { brackets: [ diff --git a/src/basic-languages/redis/redis.contribution.ts b/src/languages/definitions/redis/register.ts similarity index 100% rename from src/basic-languages/redis/redis.contribution.ts rename to src/languages/definitions/redis/register.ts diff --git a/src/basic-languages/redshift/redshift.test.ts b/src/languages/definitions/redshift/redshift.test.ts similarity index 100% rename from src/basic-languages/redshift/redshift.test.ts rename to src/languages/definitions/redshift/redshift.test.ts diff --git a/src/basic-languages/redshift/redshift.ts b/src/languages/definitions/redshift/redshift.ts similarity index 99% rename from src/basic-languages/redshift/redshift.ts rename to src/languages/definitions/redshift/redshift.ts index 4f8d42aa..d86c27be 100644 --- a/src/basic-languages/redshift/redshift.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/redshift/redshift.contribution.ts b/src/languages/definitions/redshift/register.ts similarity index 100% rename from src/basic-languages/redshift/redshift.contribution.ts rename to src/languages/definitions/redshift/register.ts diff --git a/src/languages/definitions/register.all.ts b/src/languages/definitions/register.all.ts new file mode 100644 index 00000000..ff006122 --- /dev/null +++ b/src/languages/definitions/register.all.ts @@ -0,0 +1,87 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import './abap/register'; +import './apex/register'; +import './azcli/register'; +import './bat/register'; +import './bicep/register'; +import './cameligo/register'; +import './clojure/register'; +import './coffee/register'; +import './cpp/register'; +import './csharp/register'; +import './csp/register'; +import './css/register'; +import './cypher/register'; +import './dart/register'; +import './dockerfile/register'; +import './ecl/register'; +import './elixir/register'; +import './flow9/register'; +import './fsharp/register'; +import './freemarker2/register'; +import './go/register'; +import './graphql/register'; +import './handlebars/register'; +import './hcl/register'; +import './html/register'; +import './ini/register'; +import './java/register'; +import './javascript/register'; +import './julia/register'; +import './kotlin/register'; +import './less/register'; +import './lexon/register'; +import './lua/register'; +import './liquid/register'; +import './m3/register'; +import './markdown/register'; +import './mdx/register'; +import './mips/register'; +import './msdax/register'; +import './mysql/register'; +import './objective-c/register'; +import './pascal/register'; +import './pascaligo/register'; +import './perl/register'; +import './pgsql/register'; +import './php/register'; +import './pla/register'; +import './postiats/register'; +import './powerquery/register'; +import './powershell/register'; +import './protobuf/register'; +import './pug/register'; +import './python/register'; +import './qsharp/register'; +import './r/register'; +import './razor/register'; +import './redis/register'; +import './redshift/register'; +import './restructuredtext/register'; +import './ruby/register'; +import './rust/register'; +import './sb/register'; +import './scala/register'; +import './scheme/register'; +import './scss/register'; +import './shell/register'; +import './solidity/register'; +import './sophia/register'; +import './sparql/register'; +import './sql/register'; +import './st/register'; +import './swift/register'; +import './systemverilog/register'; +import './tcl/register'; +import './twig/register'; +import './typescript/register'; +import './typespec/register'; +import './vb/register'; +import './wgsl/register'; +import './xml/register'; +import './yaml/register'; + diff --git a/src/basic-languages/restructuredtext/restructuredtext.contribution.ts b/src/languages/definitions/restructuredtext/register.ts similarity index 100% rename from src/basic-languages/restructuredtext/restructuredtext.contribution.ts rename to src/languages/definitions/restructuredtext/register.ts diff --git a/src/basic-languages/restructuredtext/restructuredtext.test.ts b/src/languages/definitions/restructuredtext/restructuredtext.test.ts similarity index 100% rename from src/basic-languages/restructuredtext/restructuredtext.test.ts rename to src/languages/definitions/restructuredtext/restructuredtext.test.ts diff --git a/src/basic-languages/restructuredtext/restructuredtext.ts b/src/languages/definitions/restructuredtext/restructuredtext.ts similarity index 99% rename from src/basic-languages/restructuredtext/restructuredtext.ts rename to src/languages/definitions/restructuredtext/restructuredtext.ts index 184b76b8..1760d1e1 100644 --- a/src/basic-languages/restructuredtext/restructuredtext.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { brackets: [ diff --git a/src/basic-languages/ruby/ruby.contribution.ts b/src/languages/definitions/ruby/register.ts similarity index 100% rename from src/basic-languages/ruby/ruby.contribution.ts rename to src/languages/definitions/ruby/register.ts diff --git a/src/basic-languages/ruby/ruby.test.ts b/src/languages/definitions/ruby/ruby.test.ts similarity index 100% rename from src/basic-languages/ruby/ruby.test.ts rename to src/languages/definitions/ruby/ruby.test.ts diff --git a/src/basic-languages/ruby/ruby.ts b/src/languages/definitions/ruby/ruby.ts similarity index 99% rename from src/basic-languages/ruby/ruby.ts rename to src/languages/definitions/ruby/ruby.ts index 9b64fee3..66f9e2a5 100644 --- a/src/basic-languages/ruby/ruby.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/rust/rust.contribution.ts b/src/languages/definitions/rust/register.ts similarity index 100% rename from src/basic-languages/rust/rust.contribution.ts rename to src/languages/definitions/rust/register.ts diff --git a/src/basic-languages/rust/rust.test.ts b/src/languages/definitions/rust/rust.test.ts similarity index 100% rename from src/basic-languages/rust/rust.test.ts rename to src/languages/definitions/rust/rust.test.ts diff --git a/src/basic-languages/rust/rust.ts b/src/languages/definitions/rust/rust.ts similarity index 99% rename from src/basic-languages/rust/rust.ts rename to src/languages/definitions/rust/rust.ts index 384c0aae..c1045a40 100644 --- a/src/basic-languages/rust/rust.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/sb/sb.contribution.ts b/src/languages/definitions/sb/register.ts similarity index 100% rename from src/basic-languages/sb/sb.contribution.ts rename to src/languages/definitions/sb/register.ts diff --git a/src/basic-languages/sb/sb.test.ts b/src/languages/definitions/sb/sb.test.ts similarity index 100% rename from src/basic-languages/sb/sb.test.ts rename to src/languages/definitions/sb/sb.test.ts diff --git a/src/basic-languages/sb/sb.ts b/src/languages/definitions/sb/sb.ts similarity index 98% rename from src/basic-languages/sb/sb.ts rename to src/languages/definitions/sb/sb.ts index 1369d2f7..cc158eb1 100644 --- a/src/basic-languages/sb/sb.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/scala/scala.contribution.ts b/src/languages/definitions/scala/register.ts similarity index 100% rename from src/basic-languages/scala/scala.contribution.ts rename to src/languages/definitions/scala/register.ts diff --git a/src/basic-languages/scala/scala.test.ts b/src/languages/definitions/scala/scala.test.ts similarity index 100% rename from src/basic-languages/scala/scala.test.ts rename to src/languages/definitions/scala/scala.test.ts diff --git a/src/basic-languages/scala/scala.ts b/src/languages/definitions/scala/scala.ts similarity index 99% rename from src/basic-languages/scala/scala.ts rename to src/languages/definitions/scala/scala.ts index 3fefe718..b6e456ae 100644 --- a/src/basic-languages/scala/scala.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { /* diff --git a/src/basic-languages/scheme/scheme.contribution.ts b/src/languages/definitions/scheme/register.ts similarity index 100% rename from src/basic-languages/scheme/scheme.contribution.ts rename to src/languages/definitions/scheme/register.ts diff --git a/src/basic-languages/scheme/scheme.test.ts b/src/languages/definitions/scheme/scheme.test.ts similarity index 100% rename from src/basic-languages/scheme/scheme.test.ts rename to src/languages/definitions/scheme/scheme.test.ts diff --git a/src/basic-languages/scheme/scheme.ts b/src/languages/definitions/scheme/scheme.ts similarity index 97% rename from src/basic-languages/scheme/scheme.ts rename to src/languages/definitions/scheme/scheme.ts index 786bb179..194bc1f5 100644 --- a/src/basic-languages/scheme/scheme.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/scss/scss.contribution.ts b/src/languages/definitions/scss/register.ts similarity index 100% rename from src/basic-languages/scss/scss.contribution.ts rename to src/languages/definitions/scss/register.ts diff --git a/src/basic-languages/scss/scss.test.ts b/src/languages/definitions/scss/scss.test.ts similarity index 100% rename from src/basic-languages/scss/scss.test.ts rename to src/languages/definitions/scss/scss.test.ts diff --git a/src/basic-languages/scss/scss.ts b/src/languages/definitions/scss/scss.ts similarity index 99% rename from src/basic-languages/scss/scss.ts rename to src/languages/definitions/scss/scss.ts index b2c77906..ebd1844e 100644 --- a/src/basic-languages/scss/scss.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { wordPattern: /(#?-?\d*\.\d\w*%?)|([@$#!.:]?[\w-?]+%?)|[@#!.]/g, diff --git a/src/basic-languages/shell/shell.contribution.ts b/src/languages/definitions/shell/register.ts similarity index 100% rename from src/basic-languages/shell/shell.contribution.ts rename to src/languages/definitions/shell/register.ts diff --git a/src/basic-languages/shell/shell.test.ts b/src/languages/definitions/shell/shell.test.ts similarity index 100% rename from src/basic-languages/shell/shell.test.ts rename to src/languages/definitions/shell/shell.test.ts diff --git a/src/basic-languages/shell/shell.ts b/src/languages/definitions/shell/shell.ts similarity index 98% rename from src/basic-languages/shell/shell.ts rename to src/languages/definitions/shell/shell.ts index 6c6c4ff8..9f06df45 100644 --- a/src/basic-languages/shell/shell.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/solidity/solidity.contribution.ts b/src/languages/definitions/solidity/register.ts similarity index 100% rename from src/basic-languages/solidity/solidity.contribution.ts rename to src/languages/definitions/solidity/register.ts diff --git a/src/basic-languages/solidity/solidity.test.ts b/src/languages/definitions/solidity/solidity.test.ts similarity index 100% rename from src/basic-languages/solidity/solidity.test.ts rename to src/languages/definitions/solidity/solidity.test.ts diff --git a/src/basic-languages/solidity/solidity.ts b/src/languages/definitions/solidity/solidity.ts similarity index 99% rename from src/basic-languages/solidity/solidity.ts rename to src/languages/definitions/solidity/solidity.ts index 02377b70..1062dc2b 100644 --- a/src/basic-languages/solidity/solidity.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/sophia/sophia.contribution.ts b/src/languages/definitions/sophia/register.ts similarity index 100% rename from src/basic-languages/sophia/sophia.contribution.ts rename to src/languages/definitions/sophia/register.ts diff --git a/src/basic-languages/sophia/sophia.test.ts b/src/languages/definitions/sophia/sophia.test.ts similarity index 100% rename from src/basic-languages/sophia/sophia.test.ts rename to src/languages/definitions/sophia/sophia.test.ts diff --git a/src/basic-languages/sophia/sophia.ts b/src/languages/definitions/sophia/sophia.ts similarity index 98% rename from src/basic-languages/sophia/sophia.ts rename to src/languages/definitions/sophia/sophia.ts index 35145329..815c936a 100644 --- a/src/basic-languages/sophia/sophia.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/sparql/sparql.contribution.ts b/src/languages/definitions/sparql/register.ts similarity index 100% rename from src/basic-languages/sparql/sparql.contribution.ts rename to src/languages/definitions/sparql/register.ts diff --git a/src/basic-languages/sparql/sparql.test.ts b/src/languages/definitions/sparql/sparql.test.ts similarity index 100% rename from src/basic-languages/sparql/sparql.test.ts rename to src/languages/definitions/sparql/sparql.test.ts diff --git a/src/basic-languages/sparql/sparql.ts b/src/languages/definitions/sparql/sparql.ts similarity index 98% rename from src/basic-languages/sparql/sparql.ts rename to src/languages/definitions/sparql/sparql.ts index 2c552d4b..1ff6a2d6 100644 --- a/src/basic-languages/sparql/sparql.ts +++ b/src/languages/definitions/sparql/sparql.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { languages } from 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/sql/keywords.js b/src/languages/definitions/sql/keywords.js similarity index 100% rename from src/basic-languages/sql/keywords.js rename to src/languages/definitions/sql/keywords.js diff --git a/src/basic-languages/sql/sql.contribution.ts b/src/languages/definitions/sql/register.ts similarity index 100% rename from src/basic-languages/sql/sql.contribution.ts rename to src/languages/definitions/sql/register.ts diff --git a/src/basic-languages/sql/sql.test.ts b/src/languages/definitions/sql/sql.test.ts similarity index 100% rename from src/basic-languages/sql/sql.test.ts rename to src/languages/definitions/sql/sql.test.ts diff --git a/src/basic-languages/sql/sql.ts b/src/languages/definitions/sql/sql.ts similarity index 99% rename from src/basic-languages/sql/sql.ts rename to src/languages/definitions/sql/sql.ts index 89e13a3c..eddfe9fa 100644 --- a/src/basic-languages/sql/sql.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/st/st.contribution.ts b/src/languages/definitions/st/register.ts similarity index 100% rename from src/basic-languages/st/st.contribution.ts rename to src/languages/definitions/st/register.ts diff --git a/src/basic-languages/st/st.test.ts b/src/languages/definitions/st/st.test.ts similarity index 100% rename from src/basic-languages/st/st.test.ts rename to src/languages/definitions/st/st.test.ts diff --git a/src/basic-languages/st/st.ts b/src/languages/definitions/st/st.ts similarity index 99% rename from src/basic-languages/st/st.ts rename to src/languages/definitions/st/st.ts index 58db492e..b68607d9 100644 --- a/src/basic-languages/st/st.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/swift/swift.contribution.ts b/src/languages/definitions/swift/register.ts similarity index 100% rename from src/basic-languages/swift/swift.contribution.ts rename to src/languages/definitions/swift/register.ts diff --git a/src/basic-languages/swift/swift.test.ts b/src/languages/definitions/swift/swift.test.ts similarity index 100% rename from src/basic-languages/swift/swift.test.ts rename to src/languages/definitions/swift/swift.test.ts diff --git a/src/basic-languages/swift/swift.ts b/src/languages/definitions/swift/swift.ts similarity index 99% rename from src/basic-languages/swift/swift.ts rename to src/languages/definitions/swift/swift.ts index d8f6cbd8..825bef26 100644 --- a/src/basic-languages/swift/swift.ts +++ b/src/languages/definitions/swift/swift.ts @@ -2,7 +2,7 @@ * Copyright (C) David Owens II, owensd.io. All rights reserved. *--------------------------------------------------------------------------------------------*/ -import type { languages } from 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/systemverilog/systemverilog.contribution.ts b/src/languages/definitions/systemverilog/register.ts similarity index 100% rename from src/basic-languages/systemverilog/systemverilog.contribution.ts rename to src/languages/definitions/systemverilog/register.ts diff --git a/src/basic-languages/systemverilog/systemverilog.test.ts b/src/languages/definitions/systemverilog/systemverilog.test.ts similarity index 100% rename from src/basic-languages/systemverilog/systemverilog.test.ts rename to src/languages/definitions/systemverilog/systemverilog.test.ts diff --git a/src/basic-languages/systemverilog/systemverilog.ts b/src/languages/definitions/systemverilog/systemverilog.ts similarity index 99% rename from src/basic-languages/systemverilog/systemverilog.ts rename to src/languages/definitions/systemverilog/systemverilog.ts index f6c97579..1534e8f8 100644 --- a/src/basic-languages/systemverilog/systemverilog.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/tcl/tcl.contribution.ts b/src/languages/definitions/tcl/register.ts similarity index 100% rename from src/basic-languages/tcl/tcl.contribution.ts rename to src/languages/definitions/tcl/register.ts diff --git a/src/basic-languages/tcl/tcl.test.ts b/src/languages/definitions/tcl/tcl.test.ts similarity index 100% rename from src/basic-languages/tcl/tcl.test.ts rename to src/languages/definitions/tcl/tcl.test.ts diff --git a/src/basic-languages/tcl/tcl.ts b/src/languages/definitions/tcl/tcl.ts similarity index 98% rename from src/basic-languages/tcl/tcl.ts rename to src/languages/definitions/tcl/tcl.ts index 5844c067..a789f109 100644 --- a/src/basic-languages/tcl/tcl.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { brackets: [ diff --git a/src/basic-languages/test/testRunner.ts b/src/languages/definitions/test/testRunner.ts similarity index 95% rename from src/basic-languages/test/testRunner.ts rename to src/languages/definitions/test/testRunner.ts index 87459710..9127e953 100644 --- a/src/basic-languages/test/testRunner.ts +++ b/src/languages/definitions/test/testRunner.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import '../monaco.contribution'; +import '../register.all'; import { loadLanguage } from '../_.contribution'; import * as assert from 'assert'; -import { editor } from 'monaco-editor-core'; +import { editor } from '../../../editor'; export interface IRelaxedToken { startIndex: number; diff --git a/src/basic-languages/twig/twig.contribution.ts b/src/languages/definitions/twig/register.ts similarity index 100% rename from src/basic-languages/twig/twig.contribution.ts rename to src/languages/definitions/twig/register.ts diff --git a/src/basic-languages/twig/twig.test.ts b/src/languages/definitions/twig/twig.test.ts similarity index 100% rename from src/basic-languages/twig/twig.test.ts rename to src/languages/definitions/twig/twig.test.ts diff --git a/src/basic-languages/twig/twig.ts b/src/languages/definitions/twig/twig.ts similarity index 99% rename from src/basic-languages/twig/twig.ts rename to src/languages/definitions/twig/twig.ts index 1dcaa612..8a43d2b8 100644 --- a/src/basic-languages/twig/twig.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\$\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\s]+)/g, diff --git a/src/basic-languages/typescript/typescript.contribution.ts b/src/languages/definitions/typescript/register.ts similarity index 100% rename from src/basic-languages/typescript/typescript.contribution.ts rename to src/languages/definitions/typescript/register.ts diff --git a/src/basic-languages/typescript/typescript.test.ts b/src/languages/definitions/typescript/typescript.test.ts similarity index 100% rename from src/basic-languages/typescript/typescript.test.ts rename to src/languages/definitions/typescript/typescript.test.ts diff --git a/src/basic-languages/typescript/typescript.ts b/src/languages/definitions/typescript/typescript.ts similarity index 99% rename from src/basic-languages/typescript/typescript.ts rename to src/languages/definitions/typescript/typescript.ts index d4e22f22..26df8bcf 100644 --- a/src/basic-languages/typescript/typescript.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { wordPattern: diff --git a/src/basic-languages/typespec/typespec.contribution.ts b/src/languages/definitions/typespec/register.ts similarity index 100% rename from src/basic-languages/typespec/typespec.contribution.ts rename to src/languages/definitions/typespec/register.ts diff --git a/src/basic-languages/typespec/typespec.test.ts b/src/languages/definitions/typespec/typespec.test.ts similarity index 100% rename from src/basic-languages/typespec/typespec.test.ts rename to src/languages/definitions/typespec/typespec.test.ts diff --git a/src/basic-languages/typespec/typespec.ts b/src/languages/definitions/typespec/typespec.ts similarity index 98% rename from src/basic-languages/typespec/typespec.ts rename to src/languages/definitions/typespec/typespec.ts index bf0ab1ce..d595c43d 100644 --- a/src/basic-languages/typespec/typespec.ts +++ b/src/languages/definitions/typespec/typespec.ts @@ -1,4 +1,4 @@ -import type { languages } from 'monaco-editor-core'; +import type { languages } from '../../../editor'; const bounded = (text: string) => `\\b${text}\\b`; const notBefore = (regex: string) => `(?!${regex})`; diff --git a/src/basic-languages/vb/vb.contribution.ts b/src/languages/definitions/vb/register.ts similarity index 100% rename from src/basic-languages/vb/vb.contribution.ts rename to src/languages/definitions/vb/register.ts diff --git a/src/basic-languages/vb/vb.test.ts b/src/languages/definitions/vb/vb.test.ts similarity index 100% rename from src/basic-languages/vb/vb.test.ts rename to src/languages/definitions/vb/vb.test.ts diff --git a/src/basic-languages/vb/vb.ts b/src/languages/definitions/vb/vb.ts similarity index 99% rename from src/basic-languages/vb/vb.ts rename to src/languages/definitions/vb/vb.ts index ae0c2e41..6b3c615b 100644 --- a/src/basic-languages/vb/vb.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/wgsl/wgsl.contribution.ts b/src/languages/definitions/wgsl/register.ts similarity index 100% rename from src/basic-languages/wgsl/wgsl.contribution.ts rename to src/languages/definitions/wgsl/register.ts diff --git a/src/basic-languages/wgsl/wgsl.test.ts b/src/languages/definitions/wgsl/wgsl.test.ts similarity index 100% rename from src/basic-languages/wgsl/wgsl.test.ts rename to src/languages/definitions/wgsl/wgsl.test.ts diff --git a/src/basic-languages/wgsl/wgsl.ts b/src/languages/definitions/wgsl/wgsl.ts similarity index 99% rename from src/basic-languages/wgsl/wgsl.ts rename to src/languages/definitions/wgsl/wgsl.ts index db185d2d..29e091d6 100644 --- a/src/basic-languages/wgsl/wgsl.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import type { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/xml/xml.contribution.ts b/src/languages/definitions/xml/register.ts similarity index 100% rename from src/basic-languages/xml/xml.contribution.ts rename to src/languages/definitions/xml/register.ts diff --git a/src/basic-languages/xml/xml.test.ts b/src/languages/definitions/xml/xml.test.ts similarity index 100% rename from src/basic-languages/xml/xml.test.ts rename to src/languages/definitions/xml/xml.test.ts diff --git a/src/basic-languages/xml/xml.ts b/src/languages/definitions/xml/xml.ts similarity index 98% rename from src/basic-languages/xml/xml.ts rename to src/languages/definitions/xml/xml.ts index 6ba7c7ea..e89899bc 100644 --- a/src/basic-languages/xml/xml.ts +++ b/src/languages/definitions/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 'monaco-editor-core'; +import { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/basic-languages/yaml/yaml.contribution.ts b/src/languages/definitions/yaml/register.ts similarity index 100% rename from src/basic-languages/yaml/yaml.contribution.ts rename to src/languages/definitions/yaml/register.ts diff --git a/src/basic-languages/yaml/yaml.test.ts b/src/languages/definitions/yaml/yaml.test.ts similarity index 100% rename from src/basic-languages/yaml/yaml.test.ts rename to src/languages/definitions/yaml/yaml.test.ts diff --git a/src/basic-languages/yaml/yaml.ts b/src/languages/definitions/yaml/yaml.ts similarity index 99% rename from src/basic-languages/yaml/yaml.ts rename to src/languages/definitions/yaml/yaml.ts index 49279e58..a30bbb3e 100644 --- a/src/basic-languages/yaml/yaml.ts +++ b/src/languages/definitions/yaml/yaml.ts @@ -1,4 +1,4 @@ -import { languages } from 'monaco-editor-core'; +import { languages } from '../../../editor'; export const conf: languages.LanguageConfiguration = { comments: { diff --git a/src/language/common/lspLanguageFeatures.ts b/src/languages/features/common/lspLanguageFeatures.ts similarity index 95% rename from src/language/common/lspLanguageFeatures.ts rename to src/languages/features/common/lspLanguageFeatures.ts index cce2aff7..60c63b35 100644 --- a/src/language/common/lspLanguageFeatures.ts +++ b/src/languages/features/common/lspLanguageFeatures.ts @@ -16,7 +16,7 @@ import { IDisposable, MarkerSeverity, IEvent -} from 'monaco-editor-core'; +} from '../../../editor'; export interface WorkerAccessor { (...more: Uri[]): Promise; @@ -157,12 +157,11 @@ export interface ILanguageWorkerWithCompletions { } export class CompletionAdapter - implements languages.CompletionItemProvider -{ + implements languages.CompletionItemProvider { constructor( private readonly _worker: WorkerAccessor, private readonly _triggerCharacters: string[] - ) {} + ) { } public get triggerCharacters(): string[] { return this._triggerCharacters; @@ -398,7 +397,7 @@ export interface ILanguageWorkerWithHover { } export class HoverAdapter implements languages.HoverProvider { - constructor(private readonly _worker: WorkerAccessor) {} + constructor(private readonly _worker: WorkerAccessor) { } provideHover( model: editor.IReadOnlyModel, @@ -473,9 +472,8 @@ export interface ILanguageWorkerWithDocumentHighlights { } export class DocumentHighlightAdapter - implements languages.DocumentHighlightProvider -{ - constructor(private readonly _worker: WorkerAccessor) {} + implements languages.DocumentHighlightProvider { + constructor(private readonly _worker: WorkerAccessor) { } public provideDocumentHighlights( model: editor.IReadOnlyModel, @@ -523,9 +521,8 @@ export interface ILanguageWorkerWithDefinitions { } export class DefinitionAdapter - implements languages.DefinitionProvider -{ - constructor(private readonly _worker: WorkerAccessor) {} + implements languages.DefinitionProvider { + constructor(private readonly _worker: WorkerAccessor) { } public provideDefinition( model: editor.IReadOnlyModel, @@ -563,9 +560,8 @@ export interface ILanguageWorkerWithReferences { } export class ReferenceAdapter - implements languages.ReferenceProvider -{ - constructor(private readonly _worker: WorkerAccessor) {} + implements languages.ReferenceProvider { + constructor(private readonly _worker: WorkerAccessor) { } provideReferences( model: editor.IReadOnlyModel, @@ -601,9 +597,8 @@ export interface ILanguageWorkerWithRename { } export class RenameAdapter - implements languages.RenameProvider -{ - constructor(private readonly _worker: WorkerAccessor) {} + implements languages.RenameProvider { + constructor(private readonly _worker: WorkerAccessor) { } provideRenameEdits( model: editor.IReadOnlyModel, @@ -655,9 +650,8 @@ export interface ILanguageWorkerWithDocumentSymbols { } export class DocumentSymbolAdapter - implements languages.DocumentSymbolProvider -{ - constructor(private readonly _worker: WorkerAccessor) {} + implements languages.DocumentSymbolProvider { + constructor(private readonly _worker: WorkerAccessor) { } public provideDocumentSymbols( model: editor.IReadOnlyModel, @@ -760,9 +754,8 @@ export interface ILanguageWorkerWithDocumentLinks { } export class DocumentLinkAdapter - implements languages.LinkProvider -{ - constructor(private _worker: WorkerAccessor) {} + implements languages.LinkProvider { + constructor(private _worker: WorkerAccessor) { } public provideLinks( model: editor.IReadOnlyModel, @@ -799,9 +792,8 @@ export interface ILanguageWorkerWithFormat { } export class DocumentFormattingEditProvider - implements languages.DocumentFormattingEditProvider -{ - constructor(private _worker: WorkerAccessor) {} + implements languages.DocumentFormattingEditProvider { + constructor(private _worker: WorkerAccessor) { } public provideDocumentFormattingEdits( model: editor.IReadOnlyModel, @@ -824,11 +816,10 @@ export class DocumentFormattingEditProvider } export class DocumentRangeFormattingEditProvider - implements languages.DocumentRangeFormattingEditProvider -{ + implements languages.DocumentRangeFormattingEditProvider { readonly canFormatMultipleRanges = false; - constructor(private _worker: WorkerAccessor) {} + constructor(private _worker: WorkerAccessor) { } public provideDocumentRangeFormattingEdits( model: editor.IReadOnlyModel, @@ -872,9 +863,8 @@ export interface ILanguageWorkerWithDocumentColors { } export class DocumentColorAdapter - implements languages.DocumentColorProvider -{ - constructor(private readonly _worker: WorkerAccessor) {} + implements languages.DocumentColorProvider { + constructor(private readonly _worker: WorkerAccessor) { } public provideDocumentColors( model: editor.IReadOnlyModel, @@ -936,9 +926,8 @@ export interface ILanguageWorkerWithFoldingRanges { } export class FoldingRangeAdapter - implements languages.FoldingRangeProvider -{ - constructor(private _worker: WorkerAccessor) {} + implements languages.FoldingRangeProvider { + constructor(private _worker: WorkerAccessor) { } public provideFoldingRanges( model: editor.IReadOnlyModel, @@ -990,9 +979,8 @@ export interface ILanguageWorkerWithSelectionRanges { } export class SelectionRangeAdapter - implements languages.SelectionRangeProvider -{ - constructor(private _worker: WorkerAccessor) {} + implements languages.SelectionRangeProvider { + constructor(private _worker: WorkerAccessor) { } public provideSelectionRanges( model: editor.IReadOnlyModel, diff --git a/src/language/css/css.worker.ts b/src/languages/features/css/css.worker.ts similarity index 88% rename from src/language/css/css.worker.ts rename to src/languages/features/css/css.worker.ts index ff521e36..e7e1a877 100644 --- a/src/language/css/css.worker.ts +++ b/src/languages/features/css/css.worker.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { initialize } from '../../common/initialize'; +import { initialize } from '../../../internal/common/initialize'; import { CSSWorker } from './cssWorker'; self.onmessage = () => { diff --git a/src/language/css/cssMode.ts b/src/languages/features/css/cssMode.ts similarity index 96% rename from src/language/css/cssMode.ts rename to src/languages/features/css/cssMode.ts index a3d562e1..91c43bb9 100644 --- a/src/language/css/cssMode.ts +++ b/src/languages/features/css/cssMode.ts @@ -5,9 +5,9 @@ import { WorkerManager } from './workerManager'; import type { CSSWorker } from './cssWorker'; -import { LanguageServiceDefaults } from './monaco.contribution'; +import { LanguageServiceDefaults } from './register'; import * as languageFeatures from '../common/lspLanguageFeatures'; -import { Uri, IDisposable, languages } from 'monaco-editor-core'; +import { Uri, IDisposable, languages } from '../../../editor'; export function setupMode(defaults: LanguageServiceDefaults): IDisposable { const disposables: IDisposable[] = []; diff --git a/src/language/css/cssWorker.ts b/src/languages/features/css/cssWorker.ts similarity index 98% rename from src/language/css/cssWorker.ts rename to src/languages/features/css/cssWorker.ts index 60ffa97a..ced92237 100644 --- a/src/language/css/cssWorker.ts +++ b/src/languages/features/css/cssWorker.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { worker } from 'monaco-editor-core'; +import type { worker } from '../../../editor'; import * as cssService from 'vscode-css-languageservice'; -import { Options } from './monaco.contribution'; +import { Options } from './register'; export class CSSWorker { // --- model sync ----------------------- diff --git a/src/language/css/monaco.contribution.ts b/src/languages/features/css/register.ts similarity index 99% rename from src/language/css/monaco.contribution.ts rename to src/languages/features/css/register.ts index 0e4e3f71..27d26c4f 100644 --- a/src/language/css/monaco.contribution.ts +++ b/src/languages/features/css/register.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as mode from './cssMode'; -import { languages, Emitter, IEvent } from 'monaco-editor-core'; +import { languages, Emitter, IEvent } from '../../../editor'; 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/languages/features/css/workerManager.ts similarity index 93% rename from src/language/css/workerManager.ts rename to src/languages/features/css/workerManager.ts index b2463dc7..cc8f78b6 100644 --- a/src/language/css/workerManager.ts +++ b/src/languages/features/css/workerManager.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { LanguageServiceDefaults } from './monaco.contribution'; +import { LanguageServiceDefaults } from './register'; import type { CSSWorker } from './cssWorker'; -import { editor, IDisposable, Uri } from 'monaco-editor-core'; -import { createWebWorker } from '../../common/workers'; +import { editor, IDisposable, Uri } from '../../../editor'; +import { createWebWorker } from '../../../internal/common/workers'; const STOP_WHEN_IDLE_FOR = 2 * 60 * 1000; // 2min diff --git a/src/language/html/html.worker.ts b/src/languages/features/html/html.worker.ts similarity index 89% rename from src/language/html/html.worker.ts rename to src/languages/features/html/html.worker.ts index 57627861..92c448af 100644 --- a/src/language/html/html.worker.ts +++ b/src/languages/features/html/html.worker.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as worker from '../../common/initialize'; +import * as worker from '../../../internal/common/initialize'; import { HTMLWorker } from './htmlWorker'; self.onmessage = () => { diff --git a/src/language/html/htmlMode.ts b/src/languages/features/html/htmlMode.ts similarity index 97% rename from src/language/html/htmlMode.ts rename to src/languages/features/html/htmlMode.ts index 9e07cdd5..f750893a 100644 --- a/src/language/html/htmlMode.ts +++ b/src/languages/features/html/htmlMode.ts @@ -5,9 +5,9 @@ import { WorkerManager } from './workerManager'; import type { HTMLWorker } from './htmlWorker'; -import { LanguageServiceDefaults } from './monaco.contribution'; +import { LanguageServiceDefaults } from './register'; import * as languageFeatures from '../common/lspLanguageFeatures'; -import { Uri, IDisposable, languages } from 'monaco-editor-core'; +import { Uri, IDisposable, languages } from '../../../editor'; class HTMLCompletionAdapter extends languageFeatures.CompletionAdapter { constructor(worker: languageFeatures.WorkerAccessor) { diff --git a/src/language/html/htmlWorker.ts b/src/languages/features/html/htmlWorker.ts similarity index 98% rename from src/language/html/htmlWorker.ts rename to src/languages/features/html/htmlWorker.ts index c3979577..2a06c269 100644 --- a/src/language/html/htmlWorker.ts +++ b/src/languages/features/html/htmlWorker.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { worker } from 'monaco-editor-core'; +import { worker } from '../../../editor'; import * as htmlService from 'vscode-html-languageservice'; -import type { Options } from './monaco.contribution'; import { IHTMLDataProvider } from 'vscode-html-languageservice'; +import type { Options } from './register'; export class HTMLWorker { private _ctx: worker.IWorkerContext; diff --git a/src/language/html/monaco.contribution.ts b/src/languages/features/html/register.ts similarity index 99% rename from src/language/html/monaco.contribution.ts rename to src/languages/features/html/register.ts index 9eda9784..12702ef1 100644 --- a/src/language/html/monaco.contribution.ts +++ b/src/languages/features/html/register.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as mode from './htmlMode'; -import { languages, Emitter, IEvent, IDisposable } from 'monaco-editor-core'; +import { languages, Emitter, IEvent, IDisposable } from '../../../editor'; export interface HTMLFormatConfiguration { readonly tabSize: number; diff --git a/src/language/html/workerManager.ts b/src/languages/features/html/workerManager.ts similarity index 93% rename from src/language/html/workerManager.ts rename to src/languages/features/html/workerManager.ts index 3c559952..5c88b365 100644 --- a/src/language/html/workerManager.ts +++ b/src/languages/features/html/workerManager.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { LanguageServiceDefaults } from './monaco.contribution'; +import { LanguageServiceDefaults } from './register'; import type { HTMLWorker } from './htmlWorker'; -import { Uri, IDisposable, editor } from 'monaco-editor-core'; -import { createWebWorker } from '../../common/workers'; +import { Uri, IDisposable, editor } from '../../../editor'; +import { createWebWorker } from '../../../internal/common/workers'; const STOP_WHEN_IDLE_FOR = 2 * 60 * 1000; // 2min diff --git a/src/language/json/json.worker.ts b/src/languages/features/json/json.worker.ts similarity index 89% rename from src/language/json/json.worker.ts rename to src/languages/features/json/json.worker.ts index 6431a914..7efd0479 100644 --- a/src/language/json/json.worker.ts +++ b/src/languages/features/json/json.worker.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as worker from '../../common/initialize'; +import * as worker from '../../../internal/common/initialize'; import { JSONWorker } from './jsonWorker'; self.onmessage = () => { diff --git a/src/language/json/jsonMode.ts b/src/languages/features/json/jsonMode.ts similarity index 97% rename from src/language/json/jsonMode.ts rename to src/languages/features/json/jsonMode.ts index c7847883..09499613 100644 --- a/src/language/json/jsonMode.ts +++ b/src/languages/features/json/jsonMode.ts @@ -5,10 +5,10 @@ import { WorkerManager } from './workerManager'; import type { JSONWorker } from './jsonWorker'; -import { LanguageServiceDefaults } from './monaco.contribution'; +import { LanguageServiceDefaults } from './register'; import * as languageFeatures from '../common/lspLanguageFeatures'; import { createTokenizationSupport } from './tokenization'; -import { Uri, IDisposable, languages, editor } from 'monaco-editor-core'; +import { Uri, IDisposable, languages, editor } from '../../../editor'; let worker: languageFeatures.WorkerAccessor; diff --git a/src/language/json/jsonWorker.ts b/src/languages/features/json/jsonWorker.ts similarity index 98% rename from src/language/json/jsonWorker.ts rename to src/languages/features/json/jsonWorker.ts index 247cc8eb..a8472831 100644 --- a/src/language/json/jsonWorker.ts +++ b/src/languages/features/json/jsonWorker.ts @@ -4,9 +4,9 @@ *--------------------------------------------------------------------------------------------*/ import * as jsonService from 'vscode-json-languageservice'; -import type { worker } from 'monaco-editor-core'; +import type { worker } from '../../../editor'; import { URI } from 'vscode-uri'; -import { DiagnosticsOptions } from './monaco.contribution'; +import { DiagnosticsOptions } from './register'; let defaultSchemaRequestService: ((url: string) => Promise) | undefined; if (typeof fetch !== 'undefined') { diff --git a/src/language/json/monaco.contribution.ts b/src/languages/features/json/register.ts similarity index 99% rename from src/language/json/monaco.contribution.ts rename to src/languages/features/json/register.ts index 851769a8..0c727c6d 100644 --- a/src/language/json/monaco.contribution.ts +++ b/src/languages/features/json/register.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as mode from './jsonMode'; -import { Emitter, IEvent, languages, Uri } from 'monaco-editor-core'; +import { Emitter, IEvent, languages, Uri } from '../../../editor'; // ---- JSON service types ---- export interface BaseASTNode { diff --git a/src/language/json/tokenization.ts b/src/languages/features/json/tokenization.ts similarity index 98% rename from src/language/json/tokenization.ts rename to src/languages/features/json/tokenization.ts index 25d4587c..84ca4b75 100644 --- a/src/language/json/tokenization.ts +++ b/src/languages/features/json/tokenization.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as json from 'jsonc-parser'; -import { languages } from 'monaco-editor-core'; +import { languages } from '../../../editor'; export function createTokenizationSupport(supportComments: boolean): languages.TokensProvider { return { @@ -31,7 +31,7 @@ const enum JSONParent { } class ParentsStack { - constructor(public readonly parent: ParentsStack | null, public readonly type: JSONParent) {} + constructor(public readonly parent: ParentsStack | null, public readonly type: JSONParent) { } public static pop(parents: ParentsStack | null): ParentsStack | null { if (parents) { diff --git a/src/language/json/workerManager.ts b/src/languages/features/json/workerManager.ts similarity index 93% rename from src/language/json/workerManager.ts rename to src/languages/features/json/workerManager.ts index b2e66d31..2cddd5e9 100644 --- a/src/language/json/workerManager.ts +++ b/src/languages/features/json/workerManager.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { LanguageServiceDefaults } from './monaco.contribution'; +import { LanguageServiceDefaults } from './register'; import type { JSONWorker } from './jsonWorker'; -import { IDisposable, Uri, editor } from 'monaco-editor-core'; -import { createWebWorker } from '../../common/workers'; +import { IDisposable, Uri, editor } from '../../../editor'; +import { createWebWorker } from '../../../internal/common/workers'; const STOP_WHEN_IDLE_FOR = 2 * 60 * 1000; // 2min diff --git a/src/languages/features/register.all.ts b/src/languages/features/register.all.ts new file mode 100644 index 00000000..559486e9 --- /dev/null +++ b/src/languages/features/register.all.ts @@ -0,0 +1,6 @@ +import * as css from './css/register'; +import * as html from './html/register'; +import * as json from './json/register'; +import * as typescript from './typescript/register'; + +export { css, html, json, typescript }; diff --git a/src/language/typescript/languageFeatures.ts b/src/languages/features/typescript/languageFeatures.ts similarity index 98% rename from src/language/typescript/languageFeatures.ts rename to src/languages/features/typescript/languageFeatures.ts index 37df03d2..561f6636 100644 --- a/src/language/typescript/languageFeatures.ts +++ b/src/languages/features/typescript/languageFeatures.ts @@ -8,7 +8,7 @@ import { DiagnosticRelatedInformation, LanguageServiceDefaults, typescriptDefaults -} from './monaco.contribution'; +} from './register'; import type * as ts from './lib/typescriptServices'; import type { TypeScriptWorker } from './tsWorker'; import { libFileSet } from './lib/lib.index'; @@ -23,7 +23,7 @@ import { IRange, MarkerTag, MarkerSeverity -} from 'monaco-editor-core'; +} from '../../../editor'; //#region utils copied from typescript to prevent loading the entire typescriptServices --- @@ -71,7 +71,7 @@ function displayPartsToString(displayParts: ts.SymbolDisplayPart[] | undefined): //#endregion export abstract class Adapter { - constructor(protected _worker: (...uris: Uri[]) => Promise) {} + constructor(protected _worker: (...uris: Uri[]) => Promise) { } // protected _positionToOffset(model: editor.ITextModel, position: monaco.IPosition): number { // return model.getOffsetAt(position); @@ -669,7 +669,7 @@ export class SignatureHelpAdapter extends Adapter implements languages.Signature return { value: ret, - dispose() {} + dispose() { } }; } } @@ -717,8 +717,7 @@ export class QuickInfoAdapter extends Adapter implements languages.HoverProvider export class DocumentHighlightAdapter extends Adapter - implements languages.DocumentHighlightProvider -{ + implements languages.DocumentHighlightProvider { public async provideDocumentHighlights( model: editor.ITextModel, position: Position, @@ -987,8 +986,7 @@ export abstract class FormatHelper extends Adapter { export class FormatAdapter extends FormatHelper - implements languages.DocumentRangeFormattingEditProvider -{ + implements languages.DocumentRangeFormattingEditProvider { readonly canFormatMultipleRanges = false; public async provideDocumentRangeFormattingEdits( @@ -1029,8 +1027,7 @@ export class FormatAdapter export class FormatOnTypeAdapter extends FormatHelper - implements languages.OnTypeFormattingEditProvider -{ + implements languages.OnTypeFormattingEditProvider { get autoFormatTriggerCharacters() { return [';', '}', '\n']; } @@ -1103,7 +1100,7 @@ export class CodeActionAdaptor extends FormatHelper implements languages.CodeAct ); if (!codeFixes || model.isDisposed()) { - return { actions: [], dispose: () => {} }; + return { actions: [], dispose: () => { } }; } const actions = codeFixes @@ -1117,7 +1114,7 @@ export class CodeActionAdaptor extends FormatHelper implements languages.CodeAct return { actions: actions, - dispose: () => {} + dispose: () => { } }; } @@ -1253,7 +1250,7 @@ export class InlayHintsAdapter extends Adapter implements languages.InlayHintsPr kind: this._convertHintKind(hint.kind) }; }); - return { hints, dispose: () => {} }; + return { hints, dispose: () => { } }; } private _convertHintKind(kind?: ts.InlayHintKind) { diff --git a/src/language/typescript/lib/editor.worker.d.ts b/src/languages/features/typescript/lib/editor.worker.d.ts similarity index 100% rename from src/language/typescript/lib/editor.worker.d.ts rename to src/languages/features/typescript/lib/editor.worker.d.ts diff --git a/src/language/typescript/lib/lib.index.ts b/src/languages/features/typescript/lib/lib.index.ts similarity index 100% rename from src/language/typescript/lib/lib.index.ts rename to src/languages/features/typescript/lib/lib.index.ts diff --git a/src/language/typescript/lib/lib.ts b/src/languages/features/typescript/lib/lib.ts similarity index 100% rename from src/language/typescript/lib/lib.ts rename to src/languages/features/typescript/lib/lib.ts diff --git a/src/language/typescript/lib/typescriptServices.d.ts b/src/languages/features/typescript/lib/typescriptServices.d.ts similarity index 100% rename from src/language/typescript/lib/typescriptServices.d.ts rename to src/languages/features/typescript/lib/typescriptServices.d.ts diff --git a/src/language/typescript/lib/typescriptServices.js b/src/languages/features/typescript/lib/typescriptServices.js similarity index 100% rename from src/language/typescript/lib/typescriptServices.js rename to src/languages/features/typescript/lib/typescriptServices.js diff --git a/src/language/typescript/lib/typescriptServicesMetadata.ts b/src/languages/features/typescript/lib/typescriptServicesMetadata.ts similarity index 100% rename from src/language/typescript/lib/typescriptServicesMetadata.ts rename to src/languages/features/typescript/lib/typescriptServicesMetadata.ts diff --git a/src/language/typescript/monaco.contribution.ts b/src/languages/features/typescript/register.ts similarity index 99% rename from src/language/typescript/monaco.contribution.ts rename to src/languages/features/typescript/register.ts index bd3cf2c7..4ecc941a 100644 --- a/src/language/typescript/monaco.contribution.ts +++ b/src/languages/features/typescript/register.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 'monaco-editor-core'; +import { languages, Emitter, IEvent, IDisposable, Uri } from '../../../editor'; //#region enums copied from typescript to prevent loading the entire typescriptServices --- diff --git a/src/language/typescript/ts.worker.ts b/src/languages/features/typescript/ts.worker.ts similarity index 87% rename from src/language/typescript/ts.worker.ts rename to src/languages/features/typescript/ts.worker.ts index 25d778d6..4be85799 100644 --- a/src/language/typescript/ts.worker.ts +++ b/src/languages/features/typescript/ts.worker.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { initialize } from '../../common/initialize'; +import { initialize } from '../../../internal/common/initialize'; import * as ts from './lib/typescriptServices'; import { ICreateData, TypeScriptWorker, create } from './tsWorker'; -import { worker } from 'monaco-editor-core'; +import { worker } from '../../../editor'; import { libFileMap } from './lib/lib'; self.onmessage = () => { diff --git a/src/language/typescript/tsMode.ts b/src/languages/features/typescript/tsMode.ts similarity index 97% rename from src/language/typescript/tsMode.ts rename to src/languages/features/typescript/tsMode.ts index 61e5a792..222b1473 100644 --- a/src/language/typescript/tsMode.ts +++ b/src/languages/features/typescript/tsMode.ts @@ -5,9 +5,9 @@ import { WorkerManager } from './workerManager'; import type { TypeScriptWorker } from './tsWorker'; -import { LanguageServiceDefaults } from './monaco.contribution'; +import { LanguageServiceDefaults } from './register'; import * as languageFeatures from './languageFeatures'; -import { languages, IDisposable, Uri } from 'monaco-editor-core'; +import { languages, IDisposable, Uri } from '../../../editor'; let javaScriptWorker: (...uris: Uri[]) => Promise; let typeScriptWorker: (...uris: Uri[]) => Promise; diff --git a/src/language/typescript/tsWorker.ts b/src/languages/features/typescript/tsWorker.ts similarity index 99% rename from src/language/typescript/tsWorker.ts rename to src/languages/features/typescript/tsWorker.ts index e2661a9d..a8586361 100644 --- a/src/language/typescript/tsWorker.ts +++ b/src/languages/features/typescript/tsWorker.ts @@ -11,8 +11,8 @@ import { EmitOutput, IExtraLibs, TypeScriptWorker as ITypeScriptWorker -} from './monaco.contribution'; -import { Uri, worker } from 'monaco-editor-core'; +} from './register'; +import { Uri, worker } from '../../../editor'; /** * Loading a default lib as a source file will mess up TS completely. diff --git a/src/language/typescript/workerManager.ts b/src/languages/features/typescript/workerManager.ts similarity index 94% rename from src/language/typescript/workerManager.ts rename to src/languages/features/typescript/workerManager.ts index f0cbcacd..989d70b1 100644 --- a/src/language/typescript/workerManager.ts +++ b/src/languages/features/typescript/workerManager.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { LanguageServiceDefaults } from './monaco.contribution'; +import { LanguageServiceDefaults } from './register'; import type { TypeScriptWorker } from './tsWorker'; -import { editor, Uri, IDisposable } from 'monaco-editor-core'; -import { createWebWorker } from '../../common/workers'; +import { editor, Uri, IDisposable } from '../../../editor'; +import { createWebWorker } from '../../../internal/common/workers'; export class WorkerManager { private _configChangeListener: IDisposable; diff --git a/src/languages/register.all.ts b/src/languages/register.all.ts new file mode 100644 index 00000000..25a05444 --- /dev/null +++ b/src/languages/register.all.ts @@ -0,0 +1,2 @@ +export * from './definitions/register.all'; +export * from './features/register.all';