diff --git a/.prettierignore b/.prettierignore
index 33639d99..67d04feb 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -12,7 +12,5 @@
/monaco-editor/typedoc/monaco.d.ts
/monaco-editor/website/lib/
/monaco-editor-webpack-plugin/test/dist/*.js
-/monaco-languages/out/
-/monaco-languages/release/
/release/
/src/typescript/lib/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 47da1083..63af432c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,10 +11,10 @@ This repository contains source code only for Monaco Editor Languages, the core
## Contributing a new tokenizer / a new language
-- create `$/monaco-languages/src/myLang/myLang.contribution.ts`
-- create `$/monaco-languages/src/myLang/myLang.ts`
-- create `$/monaco-languages/src/myLang/myLang.test.ts`
-- edit `$/monaco-languages/src/monaco.contribution.ts` and register your new language
+- create `$/src/basic-languages/myLang/myLang.contribution.ts`
+- create `$/src/basic-languages/myLang/myLang.ts`
+- create `$/src/basic-languages/myLang/myLang.test.ts`
+- edit `$/src/basic-languages/monaco.contribution.ts` and register your new language
```js
import './myLang/myLang.contribution';
diff --git a/build/build.js b/build/build.js
index f247c814..619bf425 100644
--- a/build/build.js
+++ b/build/build.js
@@ -5,6 +5,7 @@
//@ts-check
+const glob = require('glob');
const { copyFile, removeDir, tsc, dts, buildESM2, buildAMD2 } = require('../build/utils');
removeDir(`out`);
@@ -152,3 +153,51 @@ buildAMD2({
});
//#endregion
+
+//#region basic-languages
+
+glob('../src/basic-languages/*/*.contribution.ts', { cwd: __dirname }, function (err, files) {
+ if (err) {
+ console.error(err);
+ return;
+ }
+
+ const languages = files.map((file) => file.split('/')[3]);
+
+ // ESM
+ {
+ /** @type {string[]} */
+ const entryPoints = ['src/basic-languages/monaco.contribution.ts', 'src/basic-languages/_.contribution.ts'];
+ const external = ['monaco-editor-core', '*/_.contribution'];
+ for (const language of languages) {
+ entryPoints.push(`src/basic-languages/${language}/${language}.contribution.ts`);
+ entryPoints.push(`src/basic-languages/${language}/${language}.ts`);
+ external.push(`*/${language}.contribution`);
+ external.push(`*/${language}`);
+ }
+ buildESM2({
+ base: 'basic-languages',
+ entryPoints,
+ external
+ });
+ }
+
+ // AMD
+ {
+ buildAMD2({
+ base: 'basic-languages',
+ entryPoint: 'src/basic-languages/monaco.contribution.ts',
+ amdModuleId: 'vs/basic-languages/monaco.contribution',
+ amdDependencies: ['vs/editor/editor.api']
+ });
+ for (const language of languages) {
+ buildAMD2({
+ base: 'basic-languages',
+ entryPoint: `src/basic-languages/${language}/${language}.ts`,
+ amdModuleId: `vs/basic-languages/${language}/${language}`
+ });
+ }
+ }
+});
+
+//#endregion
diff --git a/monaco-editor/metadata.js b/monaco-editor/metadata.js
index f528f61b..d74f298a 100644
--- a/monaco-editor/metadata.js
+++ b/monaco-editor/metadata.js
@@ -63,12 +63,12 @@
name: 'monaco-languages',
contrib: 'vs/basic-languages/monaco.contribution',
modulePrefix: 'vs/basic-languages',
- rootPath: './monaco-languages',
+ rootPath: './out/release/basic-languages',
paths: {
// use ./ to indicate it is relative to the `rootPath`
- dev: './release/dev',
- min: './release/min',
- esm: './release/esm'
+ dev: './dev',
+ min: './min',
+ esm: './esm'
}
}
]
diff --git a/monaco-editor/website/monarch.html b/monaco-editor/website/monarch.html
index 952ca77d..e9c68829 100644
--- a/monaco-editor/website/monarch.html
+++ b/monaco-editor/website/monarch.html
@@ -859,8 +859,8 @@ embedded: [
Additional examples can be found in the
- src folder of the
- monaco-languages
+ src/basic-languages folder of the
+ monaco-editor
repo.
diff --git a/monaco-languages/.github/workflows/ci.yml b/monaco-languages/.github/workflows/ci.yml
deleted file mode 100644
index 43519669..00000000
--- a/monaco-languages/.github/workflows/ci.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: CI
-
-on: [push, pull_request]
-
-jobs:
- ci:
- name: CI
- runs-on: ubuntu-latest
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- steps:
- - uses: actions/checkout@v2
-
- - uses: actions/setup-node@v2
- with:
- node-version: 12
-
- - name: npm install
- run: npm install
-
- - name: Compile
- run: npm run compile
-
- - name: Test
- run: npm test
diff --git a/monaco-languages/build.js b/monaco-languages/build.js
deleted file mode 100644
index fe1aee6e..00000000
--- a/monaco-languages/build.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-//@ts-check
-
-const glob = require('glob');
-const { removeDir, tsc, buildESM, buildAMD } = require('../build/utils');
-
-removeDir(`monaco-languages/release`);
-removeDir(`monaco-languages/out`);
-
-tsc(`monaco-languages/src/tsconfig.json`);
-
-glob('src/*/*.contribution.ts', { cwd: __dirname }, function (err, files) {
- if (err) {
- console.error(err);
- return;
- }
-
- const languages = files.map((file) => file.split('/')[1]);
-
- // ESM
- {
- /** @type {string[]} */
- const entryPoints = ['src/monaco.contribution.ts', 'src/_.contribution.ts'];
- const external = ['monaco-editor-core', '*/_.contribution'];
- for (const language of languages) {
- entryPoints.push(`src/${language}/${language}.contribution.ts`);
- entryPoints.push(`src/${language}/${language}.ts`);
- external.push(`*/${language}.contribution`);
- external.push(`*/${language}`);
- }
- buildESM({
- base: 'monaco-languages',
- entryPoints,
- external
- });
- }
-
- // AMD
- {
- buildAMD({
- base: 'monaco-languages',
- entryPoint: 'src/monaco.contribution.ts',
- amdModuleId: 'vs/basic-languages/monaco.contribution',
- amdDependencies: ['vs/editor/editor.api']
- });
- for (const language of languages) {
- buildAMD({
- base: 'monaco-languages',
- entryPoint: `src/${language}/${language}.ts`,
- amdModuleId: `vs/basic-languages/${language}/${language}`
- });
- }
- }
-});
diff --git a/monaco-languages/src/fillers/monaco-editor-core.ts b/monaco-languages/src/fillers/monaco-editor-core.ts
deleted file mode 100644
index cd996aa7..00000000
--- a/monaco-languages/src/fillers/monaco-editor-core.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-export * from 'monaco-editor-core';
diff --git a/monaco-languages/src/mocha.d.ts b/monaco-languages/src/mocha.d.ts
deleted file mode 100644
index c9a22b6f..00000000
--- a/monaco-languages/src/mocha.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-declare function run(): void;
-
-declare function suite(name: string, fn: (err?: any) => void): void;
-declare function test(name: string, fn: (done: (err?: any) => void) => void): void;
-declare function suiteSetup(fn: (done: (err?: any) => void) => void): void;
-declare function suiteTeardown(fn: (done: (err?: any) => void) => void): void;
-declare function setup(fn: (done: (err?: any) => void) => void): void;
-declare function teardown(fn: (done: (err?: any) => void) => void): void;
diff --git a/monaco-languages/src/tsconfig.json b/monaco-languages/src/tsconfig.json
deleted file mode 100644
index 23b3bea3..00000000
--- a/monaco-languages/src/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "compilerOptions": {
- "module": "amd",
- "moduleResolution": "node",
- "outDir": "../out/amd",
- "target": "es5",
- "strict": true,
- "lib": ["dom", "es5", "es2015.collection", "es2015.iterable", "es2015.promise"]
- }
-}
diff --git a/package.json b/package.json
index d3ed627a..29b8de2c 100644
--- a/package.json
+++ b/package.json
@@ -8,12 +8,8 @@
"scripts": {
"simpleserver": "gulp simpleserver",
"import-typescript": "node ./build/importTypescript",
- "watch-src": "tsc -w -p ./src",
- "watch-languages": "tsc -w -p ./monaco-languages/src",
- "watch": "npm-run-all -lp watch-src watch-languages",
- "release-src": "node ./build/build",
- "release-languages": "node ./monaco-languages/build",
- "release-plugins": "npm-run-all -lp release-src release-languages",
+ "watch": "tsc -w -p ./src",
+ "release-plugins": "node ./build/build",
"test": "node ./monaco-languages/test/all.js",
"gulp-release": "gulp release",
"release": "npm-run-all -ls release-plugins gulp-release",
diff --git a/monaco-languages/src/_.contribution.ts b/src/basic-languages/_.contribution.ts
similarity index 97%
rename from monaco-languages/src/_.contribution.ts
rename to src/basic-languages/_.contribution.ts
index 41092f88..a65501c3 100644
--- a/monaco-languages/src/_.contribution.ts
+++ b/src/basic-languages/_.contribution.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import { languages } from './fillers/monaco-editor-core';
+import { languages } from '../fillers/monaco-editor-core';
interface ILang extends languages.ILanguageExtensionPoint {
loader: () => Promise;
diff --git a/monaco-languages/src/abap/abap.contribution.ts b/src/basic-languages/abap/abap.contribution.ts
similarity index 100%
rename from monaco-languages/src/abap/abap.contribution.ts
rename to src/basic-languages/abap/abap.contribution.ts
diff --git a/monaco-languages/src/abap/abap.test.ts b/src/basic-languages/abap/abap.test.ts
similarity index 100%
rename from monaco-languages/src/abap/abap.test.ts
rename to src/basic-languages/abap/abap.test.ts
diff --git a/monaco-languages/src/abap/abap.ts b/src/basic-languages/abap/abap.ts
similarity index 99%
rename from monaco-languages/src/abap/abap.ts
rename to src/basic-languages/abap/abap.ts
index 092d9aea..b383aa53 100644
--- a/monaco-languages/src/abap/abap.ts
+++ b/src/basic-languages/abap/abap.ts
@@ -8,9 +8,6 @@
*
* Based on SAP ABAP Application Server 7.55
*
- * Definition:
- * https://github.com/microsoft/monaco-languages/blob/master/src/abap/abap.ts
- *
* Reference:
* https://help.sap.com/doc/abapdocu_755_index_htm/7.55/en-US/index.htm?file=abenabap_words.htm
* https://help.sap.com/doc/abapdocu_755_index_htm/7.55/en-US/index.htm?file=abenabap_index.htm
@@ -22,7 +19,7 @@
* https://github.com/Microsoft/vscode/blob/master/src/vs/editor/standalone/common/themes.ts
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/apex/apex.contribution.ts b/src/basic-languages/apex/apex.contribution.ts
similarity index 100%
rename from monaco-languages/src/apex/apex.contribution.ts
rename to src/basic-languages/apex/apex.contribution.ts
diff --git a/monaco-languages/src/apex/apex.test.ts b/src/basic-languages/apex/apex.test.ts
similarity index 100%
rename from monaco-languages/src/apex/apex.test.ts
rename to src/basic-languages/apex/apex.test.ts
diff --git a/monaco-languages/src/apex/apex.ts b/src/basic-languages/apex/apex.ts
similarity index 98%
rename from monaco-languages/src/apex/apex.ts
rename to src/basic-languages/apex/apex.ts
index 1ebed5bb..502e11fb 100644
--- a/monaco-languages/src/apex/apex.ts
+++ b/src/basic-languages/apex/apex.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
// the default separators except `@$`
diff --git a/monaco-languages/src/azcli/azcli.contribution.ts b/src/basic-languages/azcli/azcli.contribution.ts
similarity index 100%
rename from monaco-languages/src/azcli/azcli.contribution.ts
rename to src/basic-languages/azcli/azcli.contribution.ts
diff --git a/monaco-languages/src/azcli/azcli.test.ts b/src/basic-languages/azcli/azcli.test.ts
similarity index 100%
rename from monaco-languages/src/azcli/azcli.test.ts
rename to src/basic-languages/azcli/azcli.test.ts
diff --git a/monaco-languages/src/azcli/azcli.ts b/src/basic-languages/azcli/azcli.ts
similarity index 95%
rename from monaco-languages/src/azcli/azcli.ts
rename to src/basic-languages/azcli/azcli.ts
index b527a411..092e9b9f 100644
--- a/monaco-languages/src/azcli/azcli.ts
+++ b/src/basic-languages/azcli/azcli.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/bat/bat.contribution.ts b/src/basic-languages/bat/bat.contribution.ts
similarity index 100%
rename from monaco-languages/src/bat/bat.contribution.ts
rename to src/basic-languages/bat/bat.contribution.ts
diff --git a/monaco-languages/src/bat/bat.test.ts b/src/basic-languages/bat/bat.test.ts
similarity index 100%
rename from monaco-languages/src/bat/bat.test.ts
rename to src/basic-languages/bat/bat.test.ts
diff --git a/monaco-languages/src/bat/bat.ts b/src/basic-languages/bat/bat.ts
similarity index 97%
rename from monaco-languages/src/bat/bat.ts
rename to src/basic-languages/bat/bat.ts
index 0b7969dd..36945583 100644
--- a/monaco-languages/src/bat/bat.ts
+++ b/src/basic-languages/bat/bat.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/bicep/bicep.contribution.ts b/src/basic-languages/bicep/bicep.contribution.ts
similarity index 100%
rename from monaco-languages/src/bicep/bicep.contribution.ts
rename to src/basic-languages/bicep/bicep.contribution.ts
diff --git a/monaco-languages/src/bicep/bicep.test.ts b/src/basic-languages/bicep/bicep.test.ts
similarity index 100%
rename from monaco-languages/src/bicep/bicep.test.ts
rename to src/basic-languages/bicep/bicep.test.ts
diff --git a/monaco-languages/src/bicep/bicep.ts b/src/basic-languages/bicep/bicep.ts
similarity index 98%
rename from monaco-languages/src/bicep/bicep.ts
rename to src/basic-languages/bicep/bicep.ts
index 4c688701..f6769322 100644
--- a/monaco-languages/src/bicep/bicep.ts
+++ b/src/basic-languages/bicep/bicep.ts
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
const bounded = (text: string) => `\\b${text}\\b`;
diff --git a/monaco-languages/src/cameligo/cameligo.contribution.ts b/src/basic-languages/cameligo/cameligo.contribution.ts
similarity index 100%
rename from monaco-languages/src/cameligo/cameligo.contribution.ts
rename to src/basic-languages/cameligo/cameligo.contribution.ts
diff --git a/monaco-languages/src/cameligo/cameligo.test.ts b/src/basic-languages/cameligo/cameligo.test.ts
similarity index 100%
rename from monaco-languages/src/cameligo/cameligo.test.ts
rename to src/basic-languages/cameligo/cameligo.test.ts
diff --git a/monaco-languages/src/cameligo/cameligo.ts b/src/basic-languages/cameligo/cameligo.ts
similarity index 98%
rename from monaco-languages/src/cameligo/cameligo.ts
rename to src/basic-languages/cameligo/cameligo.ts
index b4fdd1ac..9ec6b7b2 100644
--- a/monaco-languages/src/cameligo/cameligo.ts
+++ b/src/basic-languages/cameligo/cameligo.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/clojure/clojure.contribution.ts b/src/basic-languages/clojure/clojure.contribution.ts
similarity index 100%
rename from monaco-languages/src/clojure/clojure.contribution.ts
rename to src/basic-languages/clojure/clojure.contribution.ts
diff --git a/monaco-languages/src/clojure/clojure.test.ts b/src/basic-languages/clojure/clojure.test.ts
similarity index 100%
rename from monaco-languages/src/clojure/clojure.test.ts
rename to src/basic-languages/clojure/clojure.test.ts
diff --git a/monaco-languages/src/clojure/clojure.ts b/src/basic-languages/clojure/clojure.ts
similarity index 99%
rename from monaco-languages/src/clojure/clojure.ts
rename to src/basic-languages/clojure/clojure.ts
index 1eaa55f9..272ba3d8 100644
--- a/monaco-languages/src/clojure/clojure.ts
+++ b/src/basic-languages/clojure/clojure.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/coffee/coffee.contribution.ts b/src/basic-languages/coffee/coffee.contribution.ts
similarity index 100%
rename from monaco-languages/src/coffee/coffee.contribution.ts
rename to src/basic-languages/coffee/coffee.contribution.ts
diff --git a/monaco-languages/src/coffee/coffee.test.ts b/src/basic-languages/coffee/coffee.test.ts
similarity index 100%
rename from monaco-languages/src/coffee/coffee.test.ts
rename to src/basic-languages/coffee/coffee.test.ts
diff --git a/monaco-languages/src/coffee/coffee.ts b/src/basic-languages/coffee/coffee.ts
similarity index 98%
rename from monaco-languages/src/coffee/coffee.ts
rename to src/basic-languages/coffee/coffee.ts
index 0994a23f..ae219d51 100644
--- a/monaco-languages/src/coffee/coffee.ts
+++ b/src/basic-languages/coffee/coffee.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
wordPattern:
diff --git a/monaco-languages/src/cpp/cpp.contribution.ts b/src/basic-languages/cpp/cpp.contribution.ts
similarity index 100%
rename from monaco-languages/src/cpp/cpp.contribution.ts
rename to src/basic-languages/cpp/cpp.contribution.ts
diff --git a/monaco-languages/src/cpp/cpp.test.ts b/src/basic-languages/cpp/cpp.test.ts
similarity index 100%
rename from monaco-languages/src/cpp/cpp.test.ts
rename to src/basic-languages/cpp/cpp.test.ts
diff --git a/monaco-languages/src/cpp/cpp.ts b/src/basic-languages/cpp/cpp.ts
similarity index 99%
rename from monaco-languages/src/cpp/cpp.ts
rename to src/basic-languages/cpp/cpp.ts
index 6b4eef50..a158fcd9 100644
--- a/monaco-languages/src/cpp/cpp.ts
+++ b/src/basic-languages/cpp/cpp.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/csharp/csharp.contribution.ts b/src/basic-languages/csharp/csharp.contribution.ts
similarity index 100%
rename from monaco-languages/src/csharp/csharp.contribution.ts
rename to src/basic-languages/csharp/csharp.contribution.ts
diff --git a/monaco-languages/src/csharp/csharp.test.ts b/src/basic-languages/csharp/csharp.test.ts
similarity index 100%
rename from monaco-languages/src/csharp/csharp.test.ts
rename to src/basic-languages/csharp/csharp.test.ts
diff --git a/monaco-languages/src/csharp/csharp.ts b/src/basic-languages/csharp/csharp.ts
similarity index 98%
rename from monaco-languages/src/csharp/csharp.ts
rename to src/basic-languages/csharp/csharp.ts
index 3b2e3e73..6f8e965e 100644
--- a/monaco-languages/src/csharp/csharp.ts
+++ b/src/basic-languages/csharp/csharp.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
wordPattern:
diff --git a/monaco-languages/src/csp/csp.contribution.ts b/src/basic-languages/csp/csp.contribution.ts
similarity index 100%
rename from monaco-languages/src/csp/csp.contribution.ts
rename to src/basic-languages/csp/csp.contribution.ts
diff --git a/monaco-languages/src/csp/csp.test.ts b/src/basic-languages/csp/csp.test.ts
similarity index 100%
rename from monaco-languages/src/csp/csp.test.ts
rename to src/basic-languages/csp/csp.test.ts
diff --git a/monaco-languages/src/csp/csp.ts b/src/basic-languages/csp/csp.ts
similarity index 96%
rename from monaco-languages/src/csp/csp.ts
rename to src/basic-languages/csp/csp.ts
index e93be69d..bbac8fab 100644
--- a/monaco-languages/src/csp/csp.ts
+++ b/src/basic-languages/csp/csp.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
brackets: [],
diff --git a/monaco-languages/src/css/css.contribution.ts b/src/basic-languages/css/css.contribution.ts
similarity index 100%
rename from monaco-languages/src/css/css.contribution.ts
rename to src/basic-languages/css/css.contribution.ts
diff --git a/monaco-languages/src/css/css.test.ts b/src/basic-languages/css/css.test.ts
similarity index 100%
rename from monaco-languages/src/css/css.test.ts
rename to src/basic-languages/css/css.test.ts
diff --git a/monaco-languages/src/css/css.ts b/src/basic-languages/css/css.ts
similarity index 98%
rename from monaco-languages/src/css/css.ts
rename to src/basic-languages/css/css.ts
index add1fab7..6d69509d 100644
--- a/monaco-languages/src/css/css.ts
+++ b/src/basic-languages/css/css.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
wordPattern: /(#?-?\d*\.\d\w*%?)|((::|[@#.!:])?[\w-?]+%?)|::|[@#.!:]/g,
diff --git a/monaco-languages/src/dart/dart.contribution.ts b/src/basic-languages/dart/dart.contribution.ts
similarity index 100%
rename from monaco-languages/src/dart/dart.contribution.ts
rename to src/basic-languages/dart/dart.contribution.ts
diff --git a/monaco-languages/src/dart/dart.test.ts b/src/basic-languages/dart/dart.test.ts
similarity index 100%
rename from monaco-languages/src/dart/dart.test.ts
rename to src/basic-languages/dart/dart.test.ts
diff --git a/monaco-languages/src/dart/dart.ts b/src/basic-languages/dart/dart.ts
similarity index 98%
rename from monaco-languages/src/dart/dart.ts
rename to src/basic-languages/dart/dart.ts
index 6ca9648e..bffea5f3 100644
--- a/monaco-languages/src/dart/dart.ts
+++ b/src/basic-languages/dart/dart.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/dockerfile/dockerfile.contribution.ts b/src/basic-languages/dockerfile/dockerfile.contribution.ts
similarity index 100%
rename from monaco-languages/src/dockerfile/dockerfile.contribution.ts
rename to src/basic-languages/dockerfile/dockerfile.contribution.ts
diff --git a/monaco-languages/src/dockerfile/dockerfile.test.ts b/src/basic-languages/dockerfile/dockerfile.test.ts
similarity index 100%
rename from monaco-languages/src/dockerfile/dockerfile.test.ts
rename to src/basic-languages/dockerfile/dockerfile.test.ts
diff --git a/monaco-languages/src/dockerfile/dockerfile.ts b/src/basic-languages/dockerfile/dockerfile.ts
similarity index 97%
rename from monaco-languages/src/dockerfile/dockerfile.ts
rename to src/basic-languages/dockerfile/dockerfile.ts
index ed59327b..d655dce7 100644
--- a/monaco-languages/src/dockerfile/dockerfile.ts
+++ b/src/basic-languages/dockerfile/dockerfile.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
brackets: [
diff --git a/monaco-languages/src/ecl/ecl.contribution.ts b/src/basic-languages/ecl/ecl.contribution.ts
similarity index 100%
rename from monaco-languages/src/ecl/ecl.contribution.ts
rename to src/basic-languages/ecl/ecl.contribution.ts
diff --git a/monaco-languages/src/ecl/ecl.test.ts b/src/basic-languages/ecl/ecl.test.ts
similarity index 100%
rename from monaco-languages/src/ecl/ecl.test.ts
rename to src/basic-languages/ecl/ecl.test.ts
diff --git a/monaco-languages/src/ecl/ecl.ts b/src/basic-languages/ecl/ecl.ts
similarity index 99%
rename from monaco-languages/src/ecl/ecl.ts
rename to src/basic-languages/ecl/ecl.ts
index a1061738..ab12908e 100644
--- a/monaco-languages/src/ecl/ecl.ts
+++ b/src/basic-languages/ecl/ecl.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/elixir/elixir.contribution.ts b/src/basic-languages/elixir/elixir.contribution.ts
similarity index 100%
rename from monaco-languages/src/elixir/elixir.contribution.ts
rename to src/basic-languages/elixir/elixir.contribution.ts
diff --git a/monaco-languages/src/elixir/elixir.test.ts b/src/basic-languages/elixir/elixir.test.ts
similarity index 100%
rename from monaco-languages/src/elixir/elixir.test.ts
rename to src/basic-languages/elixir/elixir.test.ts
diff --git a/monaco-languages/src/elixir/elixir.ts b/src/basic-languages/elixir/elixir.ts
similarity index 99%
rename from monaco-languages/src/elixir/elixir.ts
rename to src/basic-languages/elixir/elixir.ts
index 6d6028b9..f294e7c3 100644
--- a/monaco-languages/src/elixir/elixir.ts
+++ b/src/basic-languages/elixir/elixir.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/flow9/flow9.contribution.ts b/src/basic-languages/flow9/flow9.contribution.ts
similarity index 100%
rename from monaco-languages/src/flow9/flow9.contribution.ts
rename to src/basic-languages/flow9/flow9.contribution.ts
diff --git a/monaco-languages/src/flow9/flow9.test.ts b/src/basic-languages/flow9/flow9.test.ts
similarity index 100%
rename from monaco-languages/src/flow9/flow9.test.ts
rename to src/basic-languages/flow9/flow9.test.ts
diff --git a/monaco-languages/src/flow9/flow9.ts b/src/basic-languages/flow9/flow9.ts
similarity index 97%
rename from monaco-languages/src/flow9/flow9.ts
rename to src/basic-languages/flow9/flow9.ts
index e3d779c0..b7e38856 100644
--- a/monaco-languages/src/flow9/flow9.ts
+++ b/src/basic-languages/flow9/flow9.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/fsharp/fsharp.contribution.ts b/src/basic-languages/fsharp/fsharp.contribution.ts
similarity index 100%
rename from monaco-languages/src/fsharp/fsharp.contribution.ts
rename to src/basic-languages/fsharp/fsharp.contribution.ts
diff --git a/monaco-languages/src/fsharp/fsharp.test.ts b/src/basic-languages/fsharp/fsharp.test.ts
similarity index 100%
rename from monaco-languages/src/fsharp/fsharp.test.ts
rename to src/basic-languages/fsharp/fsharp.test.ts
diff --git a/monaco-languages/src/fsharp/fsharp.ts b/src/basic-languages/fsharp/fsharp.ts
similarity index 98%
rename from monaco-languages/src/fsharp/fsharp.ts
rename to src/basic-languages/fsharp/fsharp.ts
index 2b6ea177..b478d47b 100644
--- a/monaco-languages/src/fsharp/fsharp.ts
+++ b/src/basic-languages/fsharp/fsharp.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/go/go.contribution.ts b/src/basic-languages/go/go.contribution.ts
similarity index 100%
rename from monaco-languages/src/go/go.contribution.ts
rename to src/basic-languages/go/go.contribution.ts
diff --git a/monaco-languages/src/go/go.test.ts b/src/basic-languages/go/go.test.ts
similarity index 100%
rename from monaco-languages/src/go/go.test.ts
rename to src/basic-languages/go/go.test.ts
diff --git a/monaco-languages/src/go/go.ts b/src/basic-languages/go/go.ts
similarity index 98%
rename from monaco-languages/src/go/go.ts
rename to src/basic-languages/go/go.ts
index 6e3bbab5..45db7b43 100644
--- a/monaco-languages/src/go/go.ts
+++ b/src/basic-languages/go/go.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/graphql/graphql.contribution.ts b/src/basic-languages/graphql/graphql.contribution.ts
similarity index 100%
rename from monaco-languages/src/graphql/graphql.contribution.ts
rename to src/basic-languages/graphql/graphql.contribution.ts
diff --git a/monaco-languages/src/graphql/graphql.test.ts b/src/basic-languages/graphql/graphql.test.ts
similarity index 100%
rename from monaco-languages/src/graphql/graphql.test.ts
rename to src/basic-languages/graphql/graphql.test.ts
diff --git a/monaco-languages/src/graphql/graphql.ts b/src/basic-languages/graphql/graphql.ts
similarity index 98%
rename from monaco-languages/src/graphql/graphql.ts
rename to src/basic-languages/graphql/graphql.ts
index a96b93e8..10fca122 100644
--- a/monaco-languages/src/graphql/graphql.ts
+++ b/src/basic-languages/graphql/graphql.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/handlebars/handlebars.contribution.ts b/src/basic-languages/handlebars/handlebars.contribution.ts
similarity index 100%
rename from monaco-languages/src/handlebars/handlebars.contribution.ts
rename to src/basic-languages/handlebars/handlebars.contribution.ts
diff --git a/monaco-languages/src/handlebars/handlebars.test.ts b/src/basic-languages/handlebars/handlebars.test.ts
similarity index 100%
rename from monaco-languages/src/handlebars/handlebars.test.ts
rename to src/basic-languages/handlebars/handlebars.test.ts
diff --git a/monaco-languages/src/handlebars/handlebars.ts b/src/basic-languages/handlebars/handlebars.ts
similarity index 99%
rename from monaco-languages/src/handlebars/handlebars.ts
rename to src/basic-languages/handlebars/handlebars.ts
index 92bb81a7..76488c12 100644
--- a/monaco-languages/src/handlebars/handlebars.ts
+++ b/src/basic-languages/handlebars/handlebars.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import { languages } from '../fillers/monaco-editor-core';
+import { languages } from '../../fillers/monaco-editor-core';
const EMPTY_ELEMENTS: string[] = [
'area',
diff --git a/monaco-languages/src/hcl/hcl.contribution.ts b/src/basic-languages/hcl/hcl.contribution.ts
similarity index 100%
rename from monaco-languages/src/hcl/hcl.contribution.ts
rename to src/basic-languages/hcl/hcl.contribution.ts
diff --git a/monaco-languages/src/hcl/hcl.test.ts b/src/basic-languages/hcl/hcl.test.ts
similarity index 100%
rename from monaco-languages/src/hcl/hcl.test.ts
rename to src/basic-languages/hcl/hcl.test.ts
diff --git a/monaco-languages/src/hcl/hcl.ts b/src/basic-languages/hcl/hcl.ts
similarity index 98%
rename from monaco-languages/src/hcl/hcl.ts
rename to src/basic-languages/hcl/hcl.ts
index 9d37584a..62fa7ef1 100644
--- a/monaco-languages/src/hcl/hcl.ts
+++ b/src/basic-languages/hcl/hcl.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/html/html.contribution.ts b/src/basic-languages/html/html.contribution.ts
similarity index 100%
rename from monaco-languages/src/html/html.contribution.ts
rename to src/basic-languages/html/html.contribution.ts
diff --git a/monaco-languages/src/html/html.test.ts b/src/basic-languages/html/html.test.ts
similarity index 100%
rename from monaco-languages/src/html/html.test.ts
rename to src/basic-languages/html/html.test.ts
diff --git a/monaco-languages/src/html/html.ts b/src/basic-languages/html/html.ts
similarity index 99%
rename from monaco-languages/src/html/html.ts
rename to src/basic-languages/html/html.ts
index a8476184..8242ea97 100644
--- a/monaco-languages/src/html/html.ts
+++ b/src/basic-languages/html/html.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import { languages } from '../fillers/monaco-editor-core';
+import { languages } from '../../fillers/monaco-editor-core';
const EMPTY_ELEMENTS: string[] = [
'area',
diff --git a/monaco-languages/src/ini/ini.contribution.ts b/src/basic-languages/ini/ini.contribution.ts
similarity index 100%
rename from monaco-languages/src/ini/ini.contribution.ts
rename to src/basic-languages/ini/ini.contribution.ts
diff --git a/monaco-languages/src/ini/ini.ts b/src/basic-languages/ini/ini.ts
similarity index 96%
rename from monaco-languages/src/ini/ini.ts
rename to src/basic-languages/ini/ini.ts
index 7a68557d..c9b6486c 100644
--- a/monaco-languages/src/ini/ini.ts
+++ b/src/basic-languages/ini/ini.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/java/java.contribution.ts b/src/basic-languages/java/java.contribution.ts
similarity index 100%
rename from monaco-languages/src/java/java.contribution.ts
rename to src/basic-languages/java/java.contribution.ts
diff --git a/monaco-languages/src/java/java.test.ts b/src/basic-languages/java/java.test.ts
similarity index 100%
rename from monaco-languages/src/java/java.test.ts
rename to src/basic-languages/java/java.test.ts
diff --git a/monaco-languages/src/java/java.ts b/src/basic-languages/java/java.ts
similarity index 98%
rename from monaco-languages/src/java/java.ts
rename to src/basic-languages/java/java.ts
index e23485a5..6ee26971 100644
--- a/monaco-languages/src/java/java.ts
+++ b/src/basic-languages/java/java.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
// the default separators except `@$`
diff --git a/monaco-languages/src/javascript/javascript.contribution.ts b/src/basic-languages/javascript/javascript.contribution.ts
similarity index 100%
rename from monaco-languages/src/javascript/javascript.contribution.ts
rename to src/basic-languages/javascript/javascript.contribution.ts
diff --git a/monaco-languages/src/javascript/javascript.test.ts b/src/basic-languages/javascript/javascript.test.ts
similarity index 100%
rename from monaco-languages/src/javascript/javascript.test.ts
rename to src/basic-languages/javascript/javascript.test.ts
diff --git a/monaco-languages/src/javascript/javascript.ts b/src/basic-languages/javascript/javascript.ts
similarity index 95%
rename from monaco-languages/src/javascript/javascript.ts
rename to src/basic-languages/javascript/javascript.ts
index 6e34efe6..5ad3bd67 100644
--- a/monaco-languages/src/javascript/javascript.ts
+++ b/src/basic-languages/javascript/javascript.ts
@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { conf as tsConf, language as tsLanguage } from '../typescript/typescript';
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = tsConf;
diff --git a/monaco-languages/src/julia/julia.contribution.ts b/src/basic-languages/julia/julia.contribution.ts
similarity index 100%
rename from monaco-languages/src/julia/julia.contribution.ts
rename to src/basic-languages/julia/julia.contribution.ts
diff --git a/monaco-languages/src/julia/julia.test.ts b/src/basic-languages/julia/julia.test.ts
similarity index 100%
rename from monaco-languages/src/julia/julia.test.ts
rename to src/basic-languages/julia/julia.test.ts
diff --git a/monaco-languages/src/julia/julia.ts b/src/basic-languages/julia/julia.ts
similarity index 99%
rename from monaco-languages/src/julia/julia.ts
rename to src/basic-languages/julia/julia.ts
index 2d62f1a7..00b283cb 100644
--- a/monaco-languages/src/julia/julia.ts
+++ b/src/basic-languages/julia/julia.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
brackets: [
diff --git a/monaco-languages/src/kotlin/kotlin.contribution.ts b/src/basic-languages/kotlin/kotlin.contribution.ts
similarity index 100%
rename from monaco-languages/src/kotlin/kotlin.contribution.ts
rename to src/basic-languages/kotlin/kotlin.contribution.ts
diff --git a/monaco-languages/src/kotlin/kotlin.test.ts b/src/basic-languages/kotlin/kotlin.test.ts
similarity index 100%
rename from monaco-languages/src/kotlin/kotlin.test.ts
rename to src/basic-languages/kotlin/kotlin.test.ts
diff --git a/monaco-languages/src/kotlin/kotlin.ts b/src/basic-languages/kotlin/kotlin.ts
similarity index 98%
rename from monaco-languages/src/kotlin/kotlin.ts
rename to src/basic-languages/kotlin/kotlin.ts
index ca3568cb..233525b3 100644
--- a/monaco-languages/src/kotlin/kotlin.ts
+++ b/src/basic-languages/kotlin/kotlin.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
// the default separators except `@$`
diff --git a/monaco-languages/src/less/less.contribution.ts b/src/basic-languages/less/less.contribution.ts
similarity index 100%
rename from monaco-languages/src/less/less.contribution.ts
rename to src/basic-languages/less/less.contribution.ts
diff --git a/monaco-languages/src/less/less.test.ts b/src/basic-languages/less/less.test.ts
similarity index 100%
rename from monaco-languages/src/less/less.test.ts
rename to src/basic-languages/less/less.test.ts
diff --git a/monaco-languages/src/less/less.ts b/src/basic-languages/less/less.ts
similarity index 98%
rename from monaco-languages/src/less/less.ts
rename to src/basic-languages/less/less.ts
index a2fb0c85..b07e0312 100644
--- a/monaco-languages/src/less/less.ts
+++ b/src/basic-languages/less/less.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
wordPattern: /(#?-?\d*\.\d\w*%?)|([@#!.:]?[\w-?]+%?)|[@#!.]/g,
diff --git a/monaco-languages/src/lexon/lexon.contribution.ts b/src/basic-languages/lexon/lexon.contribution.ts
similarity index 100%
rename from monaco-languages/src/lexon/lexon.contribution.ts
rename to src/basic-languages/lexon/lexon.contribution.ts
diff --git a/monaco-languages/src/lexon/lexon.test.ts b/src/basic-languages/lexon/lexon.test.ts
similarity index 100%
rename from monaco-languages/src/lexon/lexon.test.ts
rename to src/basic-languages/lexon/lexon.test.ts
diff --git a/monaco-languages/src/lexon/lexon.ts b/src/basic-languages/lexon/lexon.ts
similarity index 98%
rename from monaco-languages/src/lexon/lexon.ts
rename to src/basic-languages/lexon/lexon.ts
index 29865ea9..6f22624b 100644
--- a/monaco-languages/src/lexon/lexon.ts
+++ b/src/basic-languages/lexon/lexon.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/liquid/liquid.contribution.ts b/src/basic-languages/liquid/liquid.contribution.ts
similarity index 100%
rename from monaco-languages/src/liquid/liquid.contribution.ts
rename to src/basic-languages/liquid/liquid.contribution.ts
diff --git a/monaco-languages/src/liquid/liquid.test.ts b/src/basic-languages/liquid/liquid.test.ts
similarity index 100%
rename from monaco-languages/src/liquid/liquid.test.ts
rename to src/basic-languages/liquid/liquid.test.ts
diff --git a/monaco-languages/src/liquid/liquid.ts b/src/basic-languages/liquid/liquid.ts
similarity index 98%
rename from monaco-languages/src/liquid/liquid.ts
rename to src/basic-languages/liquid/liquid.ts
index 65384185..fa434646 100644
--- a/monaco-languages/src/liquid/liquid.ts
+++ b/src/basic-languages/liquid/liquid.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import { languages } from '../fillers/monaco-editor-core';
+import { languages } from '../../fillers/monaco-editor-core';
const EMPTY_ELEMENTS: string[] = [
'area',
diff --git a/monaco-languages/src/lua/lua.contribution.ts b/src/basic-languages/lua/lua.contribution.ts
similarity index 100%
rename from monaco-languages/src/lua/lua.contribution.ts
rename to src/basic-languages/lua/lua.contribution.ts
diff --git a/monaco-languages/src/lua/lua.test.ts b/src/basic-languages/lua/lua.test.ts
similarity index 100%
rename from monaco-languages/src/lua/lua.test.ts
rename to src/basic-languages/lua/lua.test.ts
diff --git a/monaco-languages/src/lua/lua.ts b/src/basic-languages/lua/lua.ts
similarity index 98%
rename from monaco-languages/src/lua/lua.ts
rename to src/basic-languages/lua/lua.ts
index 13cef28e..8388f87b 100644
--- a/monaco-languages/src/lua/lua.ts
+++ b/src/basic-languages/lua/lua.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/m3/m3.contribution.ts b/src/basic-languages/m3/m3.contribution.ts
similarity index 100%
rename from monaco-languages/src/m3/m3.contribution.ts
rename to src/basic-languages/m3/m3.contribution.ts
diff --git a/monaco-languages/src/m3/m3.test.ts b/src/basic-languages/m3/m3.test.ts
similarity index 100%
rename from monaco-languages/src/m3/m3.test.ts
rename to src/basic-languages/m3/m3.test.ts
diff --git a/monaco-languages/src/m3/m3.ts b/src/basic-languages/m3/m3.ts
similarity index 98%
rename from monaco-languages/src/m3/m3.ts
rename to src/basic-languages/m3/m3.ts
index 243f36bd..300c7a6d 100644
--- a/monaco-languages/src/m3/m3.ts
+++ b/src/basic-languages/m3/m3.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/markdown/markdown.contribution.ts b/src/basic-languages/markdown/markdown.contribution.ts
similarity index 100%
rename from monaco-languages/src/markdown/markdown.contribution.ts
rename to src/basic-languages/markdown/markdown.contribution.ts
diff --git a/monaco-languages/src/markdown/markdown.test.ts b/src/basic-languages/markdown/markdown.test.ts
similarity index 100%
rename from monaco-languages/src/markdown/markdown.test.ts
rename to src/basic-languages/markdown/markdown.test.ts
diff --git a/monaco-languages/src/markdown/markdown.ts b/src/basic-languages/markdown/markdown.ts
similarity index 98%
rename from monaco-languages/src/markdown/markdown.ts
rename to src/basic-languages/markdown/markdown.ts
index 685fa673..5c22b3e3 100644
--- a/monaco-languages/src/markdown/markdown.ts
+++ b/src/basic-languages/markdown/markdown.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/mips/mips.contribution.ts b/src/basic-languages/mips/mips.contribution.ts
similarity index 100%
rename from monaco-languages/src/mips/mips.contribution.ts
rename to src/basic-languages/mips/mips.contribution.ts
diff --git a/monaco-languages/src/mips/mips.test.ts b/src/basic-languages/mips/mips.test.ts
similarity index 100%
rename from monaco-languages/src/mips/mips.test.ts
rename to src/basic-languages/mips/mips.test.ts
diff --git a/monaco-languages/src/mips/mips.ts b/src/basic-languages/mips/mips.ts
similarity index 98%
rename from monaco-languages/src/mips/mips.ts
rename to src/basic-languages/mips/mips.ts
index d66e4bec..37aa8ad5 100644
--- a/monaco-languages/src/mips/mips.ts
+++ b/src/basic-languages/mips/mips.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
wordPattern:
diff --git a/monaco-languages/src/monaco.contribution.ts b/src/basic-languages/monaco.contribution.ts
similarity index 100%
rename from monaco-languages/src/monaco.contribution.ts
rename to src/basic-languages/monaco.contribution.ts
diff --git a/monaco-languages/src/msdax/msdax.contribution.ts b/src/basic-languages/msdax/msdax.contribution.ts
similarity index 100%
rename from monaco-languages/src/msdax/msdax.contribution.ts
rename to src/basic-languages/msdax/msdax.contribution.ts
diff --git a/monaco-languages/src/msdax/msdax.test.ts b/src/basic-languages/msdax/msdax.test.ts
similarity index 100%
rename from monaco-languages/src/msdax/msdax.test.ts
rename to src/basic-languages/msdax/msdax.test.ts
diff --git a/monaco-languages/src/msdax/msdax.ts b/src/basic-languages/msdax/msdax.ts
similarity index 98%
rename from monaco-languages/src/msdax/msdax.ts
rename to src/basic-languages/msdax/msdax.ts
index 45124d34..8ab7f477 100644
--- a/monaco-languages/src/msdax/msdax.ts
+++ b/src/basic-languages/msdax/msdax.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/mysql/keywords.js b/src/basic-languages/mysql/keywords.js
similarity index 100%
rename from monaco-languages/src/mysql/keywords.js
rename to src/basic-languages/mysql/keywords.js
diff --git a/monaco-languages/src/mysql/keywords.mysql.txt b/src/basic-languages/mysql/keywords.mysql.txt
similarity index 100%
rename from monaco-languages/src/mysql/keywords.mysql.txt
rename to src/basic-languages/mysql/keywords.mysql.txt
diff --git a/monaco-languages/src/mysql/mysql.contribution.ts b/src/basic-languages/mysql/mysql.contribution.ts
similarity index 100%
rename from monaco-languages/src/mysql/mysql.contribution.ts
rename to src/basic-languages/mysql/mysql.contribution.ts
diff --git a/monaco-languages/src/mysql/mysql.test.ts b/src/basic-languages/mysql/mysql.test.ts
similarity index 100%
rename from monaco-languages/src/mysql/mysql.test.ts
rename to src/basic-languages/mysql/mysql.test.ts
diff --git a/monaco-languages/src/mysql/mysql.ts b/src/basic-languages/mysql/mysql.ts
similarity index 99%
rename from monaco-languages/src/mysql/mysql.ts
rename to src/basic-languages/mysql/mysql.ts
index d54f065d..ef16e561 100644
--- a/monaco-languages/src/mysql/mysql.ts
+++ b/src/basic-languages/mysql/mysql.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/objective-c/objective-c.contribution.ts b/src/basic-languages/objective-c/objective-c.contribution.ts
similarity index 100%
rename from monaco-languages/src/objective-c/objective-c.contribution.ts
rename to src/basic-languages/objective-c/objective-c.contribution.ts
diff --git a/monaco-languages/src/objective-c/objective-c.test.ts b/src/basic-languages/objective-c/objective-c.test.ts
similarity index 100%
rename from monaco-languages/src/objective-c/objective-c.test.ts
rename to src/basic-languages/objective-c/objective-c.test.ts
diff --git a/monaco-languages/src/objective-c/objective-c.ts b/src/basic-languages/objective-c/objective-c.ts
similarity index 98%
rename from monaco-languages/src/objective-c/objective-c.ts
rename to src/basic-languages/objective-c/objective-c.ts
index 04ebdc62..37e282bb 100644
--- a/monaco-languages/src/objective-c/objective-c.ts
+++ b/src/basic-languages/objective-c/objective-c.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/pascal/pascal.contribution.ts b/src/basic-languages/pascal/pascal.contribution.ts
similarity index 100%
rename from monaco-languages/src/pascal/pascal.contribution.ts
rename to src/basic-languages/pascal/pascal.contribution.ts
diff --git a/monaco-languages/src/pascal/pascal.test.ts b/src/basic-languages/pascal/pascal.test.ts
similarity index 100%
rename from monaco-languages/src/pascal/pascal.test.ts
rename to src/basic-languages/pascal/pascal.test.ts
diff --git a/monaco-languages/src/pascal/pascal.ts b/src/basic-languages/pascal/pascal.ts
similarity index 98%
rename from monaco-languages/src/pascal/pascal.ts
rename to src/basic-languages/pascal/pascal.ts
index ef0eb5b6..e51f1ca0 100644
--- a/monaco-languages/src/pascal/pascal.ts
+++ b/src/basic-languages/pascal/pascal.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
// the default separators except `@$`
diff --git a/monaco-languages/src/pascaligo/pascaligo.contribution.ts b/src/basic-languages/pascaligo/pascaligo.contribution.ts
similarity index 100%
rename from monaco-languages/src/pascaligo/pascaligo.contribution.ts
rename to src/basic-languages/pascaligo/pascaligo.contribution.ts
diff --git a/monaco-languages/src/pascaligo/pascaligo.test.ts b/src/basic-languages/pascaligo/pascaligo.test.ts
similarity index 100%
rename from monaco-languages/src/pascaligo/pascaligo.test.ts
rename to src/basic-languages/pascaligo/pascaligo.test.ts
diff --git a/monaco-languages/src/pascaligo/pascaligo.ts b/src/basic-languages/pascaligo/pascaligo.ts
similarity index 98%
rename from monaco-languages/src/pascaligo/pascaligo.ts
rename to src/basic-languages/pascaligo/pascaligo.ts
index 24b75844..23f48e40 100644
--- a/monaco-languages/src/pascaligo/pascaligo.ts
+++ b/src/basic-languages/pascaligo/pascaligo.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/perl/perl.contribution.ts b/src/basic-languages/perl/perl.contribution.ts
similarity index 100%
rename from monaco-languages/src/perl/perl.contribution.ts
rename to src/basic-languages/perl/perl.contribution.ts
diff --git a/monaco-languages/src/perl/perl.test.ts b/src/basic-languages/perl/perl.test.ts
similarity index 100%
rename from monaco-languages/src/perl/perl.test.ts
rename to src/basic-languages/perl/perl.test.ts
diff --git a/monaco-languages/src/perl/perl.ts b/src/basic-languages/perl/perl.ts
similarity index 99%
rename from monaco-languages/src/perl/perl.ts
rename to src/basic-languages/perl/perl.ts
index ce0eef8a..883d34ea 100644
--- a/monaco-languages/src/perl/perl.ts
+++ b/src/basic-languages/perl/perl.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/pgsql/keywords.js b/src/basic-languages/pgsql/keywords.js
similarity index 100%
rename from monaco-languages/src/pgsql/keywords.js
rename to src/basic-languages/pgsql/keywords.js
diff --git a/monaco-languages/src/pgsql/keywords.postgresql.txt b/src/basic-languages/pgsql/keywords.postgresql.txt
similarity index 100%
rename from monaco-languages/src/pgsql/keywords.postgresql.txt
rename to src/basic-languages/pgsql/keywords.postgresql.txt
diff --git a/monaco-languages/src/pgsql/pgsql.contribution.ts b/src/basic-languages/pgsql/pgsql.contribution.ts
similarity index 100%
rename from monaco-languages/src/pgsql/pgsql.contribution.ts
rename to src/basic-languages/pgsql/pgsql.contribution.ts
diff --git a/monaco-languages/src/pgsql/pgsql.test.ts b/src/basic-languages/pgsql/pgsql.test.ts
similarity index 100%
rename from monaco-languages/src/pgsql/pgsql.test.ts
rename to src/basic-languages/pgsql/pgsql.test.ts
diff --git a/monaco-languages/src/pgsql/pgsql.ts b/src/basic-languages/pgsql/pgsql.ts
similarity index 99%
rename from monaco-languages/src/pgsql/pgsql.ts
rename to src/basic-languages/pgsql/pgsql.ts
index 0e34d830..5f4baa86 100644
--- a/monaco-languages/src/pgsql/pgsql.ts
+++ b/src/basic-languages/pgsql/pgsql.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/php/php.contribution.ts b/src/basic-languages/php/php.contribution.ts
similarity index 100%
rename from monaco-languages/src/php/php.contribution.ts
rename to src/basic-languages/php/php.contribution.ts
diff --git a/monaco-languages/src/php/php.test.ts b/src/basic-languages/php/php.test.ts
similarity index 100%
rename from monaco-languages/src/php/php.test.ts
rename to src/basic-languages/php/php.test.ts
diff --git a/monaco-languages/src/php/php.ts b/src/basic-languages/php/php.ts
similarity index 99%
rename from monaco-languages/src/php/php.ts
rename to src/basic-languages/php/php.ts
index e02c09e6..cf32961b 100644
--- a/monaco-languages/src/php/php.ts
+++ b/src/basic-languages/php/php.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
wordPattern:
diff --git a/monaco-languages/src/pla/pla.contribution.ts b/src/basic-languages/pla/pla.contribution.ts
similarity index 100%
rename from monaco-languages/src/pla/pla.contribution.ts
rename to src/basic-languages/pla/pla.contribution.ts
diff --git a/monaco-languages/src/pla/pla.test.ts b/src/basic-languages/pla/pla.test.ts
similarity index 100%
rename from monaco-languages/src/pla/pla.test.ts
rename to src/basic-languages/pla/pla.test.ts
diff --git a/monaco-languages/src/pla/pla.ts b/src/basic-languages/pla/pla.ts
similarity index 97%
rename from monaco-languages/src/pla/pla.ts
rename to src/basic-languages/pla/pla.ts
index 0f45d80e..11f521ac 100644
--- a/monaco-languages/src/pla/pla.ts
+++ b/src/basic-languages/pla/pla.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/postiats/postiats.contribution.ts b/src/basic-languages/postiats/postiats.contribution.ts
similarity index 100%
rename from monaco-languages/src/postiats/postiats.contribution.ts
rename to src/basic-languages/postiats/postiats.contribution.ts
diff --git a/monaco-languages/src/postiats/postiats.test.ts b/src/basic-languages/postiats/postiats.test.ts
similarity index 100%
rename from monaco-languages/src/postiats/postiats.test.ts
rename to src/basic-languages/postiats/postiats.test.ts
diff --git a/monaco-languages/src/postiats/postiats.ts b/src/basic-languages/postiats/postiats.ts
similarity index 99%
rename from monaco-languages/src/postiats/postiats.ts
rename to src/basic-languages/postiats/postiats.ts
index 8c542a59..7b208b2a 100644
--- a/monaco-languages/src/postiats/postiats.ts
+++ b/src/basic-languages/postiats/postiats.ts
@@ -5,7 +5,7 @@
* Based on the ATS/Postiats lexer by Hongwei Xi.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/powerquery/powerquery.contribution.ts b/src/basic-languages/powerquery/powerquery.contribution.ts
similarity index 100%
rename from monaco-languages/src/powerquery/powerquery.contribution.ts
rename to src/basic-languages/powerquery/powerquery.contribution.ts
diff --git a/monaco-languages/src/powerquery/powerquery.test.ts b/src/basic-languages/powerquery/powerquery.test.ts
similarity index 100%
rename from monaco-languages/src/powerquery/powerquery.test.ts
rename to src/basic-languages/powerquery/powerquery.test.ts
diff --git a/monaco-languages/src/powerquery/powerquery.ts b/src/basic-languages/powerquery/powerquery.ts
similarity index 99%
rename from monaco-languages/src/powerquery/powerquery.ts
rename to src/basic-languages/powerquery/powerquery.ts
index 639200e7..fb4db167 100644
--- a/monaco-languages/src/powerquery/powerquery.ts
+++ b/src/basic-languages/powerquery/powerquery.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/powershell/powershell.contribution.ts b/src/basic-languages/powershell/powershell.contribution.ts
similarity index 100%
rename from monaco-languages/src/powershell/powershell.contribution.ts
rename to src/basic-languages/powershell/powershell.contribution.ts
diff --git a/monaco-languages/src/powershell/powershell.test.ts b/src/basic-languages/powershell/powershell.test.ts
similarity index 100%
rename from monaco-languages/src/powershell/powershell.test.ts
rename to src/basic-languages/powershell/powershell.test.ts
diff --git a/monaco-languages/src/powershell/powershell.ts b/src/basic-languages/powershell/powershell.ts
similarity index 98%
rename from monaco-languages/src/powershell/powershell.ts
rename to src/basic-languages/powershell/powershell.ts
index 2790e700..61d784bb 100644
--- a/monaco-languages/src/powershell/powershell.ts
+++ b/src/basic-languages/powershell/powershell.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
// the default separators except `$-`
diff --git a/monaco-languages/src/protobuf/protobuf.contribution.ts b/src/basic-languages/protobuf/protobuf.contribution.ts
similarity index 100%
rename from monaco-languages/src/protobuf/protobuf.contribution.ts
rename to src/basic-languages/protobuf/protobuf.contribution.ts
diff --git a/monaco-languages/src/protobuf/protobuf.test.ts b/src/basic-languages/protobuf/protobuf.test.ts
similarity index 100%
rename from monaco-languages/src/protobuf/protobuf.test.ts
rename to src/basic-languages/protobuf/protobuf.test.ts
diff --git a/monaco-languages/src/protobuf/protobuf.ts b/src/basic-languages/protobuf/protobuf.ts
similarity index 99%
rename from monaco-languages/src/protobuf/protobuf.ts
rename to src/basic-languages/protobuf/protobuf.ts
index 79ca16e3..50ed4089 100644
--- a/monaco-languages/src/protobuf/protobuf.ts
+++ b/src/basic-languages/protobuf/protobuf.ts
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
const namedLiterals = ['true', 'false'];
diff --git a/monaco-languages/src/pug/pug.contribution.ts b/src/basic-languages/pug/pug.contribution.ts
similarity index 100%
rename from monaco-languages/src/pug/pug.contribution.ts
rename to src/basic-languages/pug/pug.contribution.ts
diff --git a/monaco-languages/src/pug/pug.test.ts b/src/basic-languages/pug/pug.test.ts
similarity index 100%
rename from monaco-languages/src/pug/pug.test.ts
rename to src/basic-languages/pug/pug.test.ts
diff --git a/monaco-languages/src/pug/pug.ts b/src/basic-languages/pug/pug.ts
similarity index 99%
rename from monaco-languages/src/pug/pug.ts
rename to src/basic-languages/pug/pug.ts
index 6dcbafa2..f4b963f0 100644
--- a/monaco-languages/src/pug/pug.ts
+++ b/src/basic-languages/pug/pug.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/python/python.contribution.ts b/src/basic-languages/python/python.contribution.ts
similarity index 100%
rename from monaco-languages/src/python/python.contribution.ts
rename to src/basic-languages/python/python.contribution.ts
diff --git a/monaco-languages/src/python/python.test.ts b/src/basic-languages/python/python.test.ts
similarity index 100%
rename from monaco-languages/src/python/python.test.ts
rename to src/basic-languages/python/python.test.ts
diff --git a/monaco-languages/src/python/python.ts b/src/basic-languages/python/python.ts
similarity index 98%
rename from monaco-languages/src/python/python.ts
rename to src/basic-languages/python/python.ts
index 816cdb50..ae97c83f 100644
--- a/monaco-languages/src/python/python.ts
+++ b/src/basic-languages/python/python.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import { languages } from '../fillers/monaco-editor-core';
+import { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/qsharp/qsharp.contribution.ts b/src/basic-languages/qsharp/qsharp.contribution.ts
similarity index 100%
rename from monaco-languages/src/qsharp/qsharp.contribution.ts
rename to src/basic-languages/qsharp/qsharp.contribution.ts
diff --git a/monaco-languages/src/qsharp/qsharp.test.ts b/src/basic-languages/qsharp/qsharp.test.ts
similarity index 100%
rename from monaco-languages/src/qsharp/qsharp.test.ts
rename to src/basic-languages/qsharp/qsharp.test.ts
diff --git a/monaco-languages/src/qsharp/qsharp.ts b/src/basic-languages/qsharp/qsharp.ts
similarity index 98%
rename from monaco-languages/src/qsharp/qsharp.ts
rename to src/basic-languages/qsharp/qsharp.ts
index f4141338..6f79768e 100644
--- a/monaco-languages/src/qsharp/qsharp.ts
+++ b/src/basic-languages/qsharp/qsharp.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/r/r.contribution.ts b/src/basic-languages/r/r.contribution.ts
similarity index 100%
rename from monaco-languages/src/r/r.contribution.ts
rename to src/basic-languages/r/r.contribution.ts
diff --git a/monaco-languages/src/r/r.test.ts b/src/basic-languages/r/r.test.ts
similarity index 100%
rename from monaco-languages/src/r/r.test.ts
rename to src/basic-languages/r/r.test.ts
diff --git a/monaco-languages/src/r/r.ts b/src/basic-languages/r/r.ts
similarity index 98%
rename from monaco-languages/src/r/r.ts
rename to src/basic-languages/r/r.ts
index 644ed471..c0111c67 100644
--- a/monaco-languages/src/r/r.ts
+++ b/src/basic-languages/r/r.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/razor/razor.contribution.ts b/src/basic-languages/razor/razor.contribution.ts
similarity index 100%
rename from monaco-languages/src/razor/razor.contribution.ts
rename to src/basic-languages/razor/razor.contribution.ts
diff --git a/monaco-languages/src/razor/razor.test.ts b/src/basic-languages/razor/razor.test.ts
similarity index 100%
rename from monaco-languages/src/razor/razor.test.ts
rename to src/basic-languages/razor/razor.test.ts
diff --git a/monaco-languages/src/razor/razor.ts b/src/basic-languages/razor/razor.ts
similarity index 99%
rename from monaco-languages/src/razor/razor.ts
rename to src/basic-languages/razor/razor.ts
index 969fa486..41afaac8 100644
--- a/monaco-languages/src/razor/razor.ts
+++ b/src/basic-languages/razor/razor.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import { languages } from '../fillers/monaco-editor-core';
+import { languages } from '../../fillers/monaco-editor-core';
const EMPTY_ELEMENTS: string[] = [
'area',
diff --git a/monaco-languages/src/redis/redis.contribution.ts b/src/basic-languages/redis/redis.contribution.ts
similarity index 100%
rename from monaco-languages/src/redis/redis.contribution.ts
rename to src/basic-languages/redis/redis.contribution.ts
diff --git a/monaco-languages/src/redis/redis.test.ts b/src/basic-languages/redis/redis.test.ts
similarity index 100%
rename from monaco-languages/src/redis/redis.test.ts
rename to src/basic-languages/redis/redis.test.ts
diff --git a/monaco-languages/src/redis/redis.ts b/src/basic-languages/redis/redis.ts
similarity index 98%
rename from monaco-languages/src/redis/redis.ts
rename to src/basic-languages/redis/redis.ts
index 535dbe3f..0c5ed3aa 100644
--- a/monaco-languages/src/redis/redis.ts
+++ b/src/basic-languages/redis/redis.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
brackets: [
diff --git a/monaco-languages/src/redshift/redshift.contribution.ts b/src/basic-languages/redshift/redshift.contribution.ts
similarity index 100%
rename from monaco-languages/src/redshift/redshift.contribution.ts
rename to src/basic-languages/redshift/redshift.contribution.ts
diff --git a/monaco-languages/src/redshift/redshift.test.ts b/src/basic-languages/redshift/redshift.test.ts
similarity index 100%
rename from monaco-languages/src/redshift/redshift.test.ts
rename to src/basic-languages/redshift/redshift.test.ts
diff --git a/monaco-languages/src/redshift/redshift.ts b/src/basic-languages/redshift/redshift.ts
similarity index 99%
rename from monaco-languages/src/redshift/redshift.ts
rename to src/basic-languages/redshift/redshift.ts
index 09d5c180..fa66fccf 100644
--- a/monaco-languages/src/redshift/redshift.ts
+++ b/src/basic-languages/redshift/redshift.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/restructuredtext/restructuredtext.contribution.ts b/src/basic-languages/restructuredtext/restructuredtext.contribution.ts
similarity index 100%
rename from monaco-languages/src/restructuredtext/restructuredtext.contribution.ts
rename to src/basic-languages/restructuredtext/restructuredtext.contribution.ts
diff --git a/monaco-languages/src/restructuredtext/restructuredtext.test.ts b/src/basic-languages/restructuredtext/restructuredtext.test.ts
similarity index 100%
rename from monaco-languages/src/restructuredtext/restructuredtext.test.ts
rename to src/basic-languages/restructuredtext/restructuredtext.test.ts
diff --git a/monaco-languages/src/restructuredtext/restructuredtext.ts b/src/basic-languages/restructuredtext/restructuredtext.ts
similarity index 98%
rename from monaco-languages/src/restructuredtext/restructuredtext.ts
rename to src/basic-languages/restructuredtext/restructuredtext.ts
index 0f7eee15..fcfb24fa 100644
--- a/monaco-languages/src/restructuredtext/restructuredtext.ts
+++ b/src/basic-languages/restructuredtext/restructuredtext.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
brackets: [
diff --git a/monaco-languages/src/ruby/ruby.contribution.ts b/src/basic-languages/ruby/ruby.contribution.ts
similarity index 100%
rename from monaco-languages/src/ruby/ruby.contribution.ts
rename to src/basic-languages/ruby/ruby.contribution.ts
diff --git a/monaco-languages/src/ruby/ruby.test.ts b/src/basic-languages/ruby/ruby.test.ts
similarity index 100%
rename from monaco-languages/src/ruby/ruby.test.ts
rename to src/basic-languages/ruby/ruby.test.ts
diff --git a/monaco-languages/src/ruby/ruby.ts b/src/basic-languages/ruby/ruby.ts
similarity index 99%
rename from monaco-languages/src/ruby/ruby.ts
rename to src/basic-languages/ruby/ruby.ts
index 27167cff..8bf6925f 100644
--- a/monaco-languages/src/ruby/ruby.ts
+++ b/src/basic-languages/ruby/ruby.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/rust/rust.contribution.ts b/src/basic-languages/rust/rust.contribution.ts
similarity index 100%
rename from monaco-languages/src/rust/rust.contribution.ts
rename to src/basic-languages/rust/rust.contribution.ts
diff --git a/monaco-languages/src/rust/rust.test.ts b/src/basic-languages/rust/rust.test.ts
similarity index 100%
rename from monaco-languages/src/rust/rust.test.ts
rename to src/basic-languages/rust/rust.test.ts
diff --git a/monaco-languages/src/rust/rust.ts b/src/basic-languages/rust/rust.ts
similarity index 98%
rename from monaco-languages/src/rust/rust.ts
rename to src/basic-languages/rust/rust.ts
index a605021d..a3938476 100644
--- a/monaco-languages/src/rust/rust.ts
+++ b/src/basic-languages/rust/rust.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/sb/sb.contribution.ts b/src/basic-languages/sb/sb.contribution.ts
similarity index 100%
rename from monaco-languages/src/sb/sb.contribution.ts
rename to src/basic-languages/sb/sb.contribution.ts
diff --git a/monaco-languages/src/sb/sb.test.ts b/src/basic-languages/sb/sb.test.ts
similarity index 100%
rename from monaco-languages/src/sb/sb.test.ts
rename to src/basic-languages/sb/sb.test.ts
diff --git a/monaco-languages/src/sb/sb.ts b/src/basic-languages/sb/sb.ts
similarity index 97%
rename from monaco-languages/src/sb/sb.ts
rename to src/basic-languages/sb/sb.ts
index f73aefcf..aa58bd99 100644
--- a/monaco-languages/src/sb/sb.ts
+++ b/src/basic-languages/sb/sb.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/scala/scala.contribution.ts b/src/basic-languages/scala/scala.contribution.ts
similarity index 100%
rename from monaco-languages/src/scala/scala.contribution.ts
rename to src/basic-languages/scala/scala.contribution.ts
diff --git a/monaco-languages/src/scala/scala.test.ts b/src/basic-languages/scala/scala.test.ts
similarity index 100%
rename from monaco-languages/src/scala/scala.test.ts
rename to src/basic-languages/scala/scala.test.ts
diff --git a/monaco-languages/src/scala/scala.ts b/src/basic-languages/scala/scala.ts
similarity index 99%
rename from monaco-languages/src/scala/scala.ts
rename to src/basic-languages/scala/scala.ts
index c6656682..17f93ec2 100644
--- a/monaco-languages/src/scala/scala.ts
+++ b/src/basic-languages/scala/scala.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
/*
diff --git a/monaco-languages/src/scheme/scheme.contribution.ts b/src/basic-languages/scheme/scheme.contribution.ts
similarity index 100%
rename from monaco-languages/src/scheme/scheme.contribution.ts
rename to src/basic-languages/scheme/scheme.contribution.ts
diff --git a/monaco-languages/src/scheme/scheme.test.ts b/src/basic-languages/scheme/scheme.test.ts
similarity index 100%
rename from monaco-languages/src/scheme/scheme.test.ts
rename to src/basic-languages/scheme/scheme.test.ts
diff --git a/monaco-languages/src/scheme/scheme.ts b/src/basic-languages/scheme/scheme.ts
similarity index 97%
rename from monaco-languages/src/scheme/scheme.ts
rename to src/basic-languages/scheme/scheme.ts
index 8cc8571f..0fb579cb 100644
--- a/monaco-languages/src/scheme/scheme.ts
+++ b/src/basic-languages/scheme/scheme.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/scss/scss.contribution.ts b/src/basic-languages/scss/scss.contribution.ts
similarity index 100%
rename from monaco-languages/src/scss/scss.contribution.ts
rename to src/basic-languages/scss/scss.contribution.ts
diff --git a/monaco-languages/src/scss/scss.test.ts b/src/basic-languages/scss/scss.test.ts
similarity index 100%
rename from monaco-languages/src/scss/scss.test.ts
rename to src/basic-languages/scss/scss.test.ts
diff --git a/monaco-languages/src/scss/scss.ts b/src/basic-languages/scss/scss.ts
similarity index 99%
rename from monaco-languages/src/scss/scss.ts
rename to src/basic-languages/scss/scss.ts
index 93b40189..f3c8f21a 100644
--- a/monaco-languages/src/scss/scss.ts
+++ b/src/basic-languages/scss/scss.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
wordPattern: /(#?-?\d*\.\d\w*%?)|([@$#!.:]?[\w-?]+%?)|[@#!.]/g,
diff --git a/monaco-languages/src/shell/shell.contribution.ts b/src/basic-languages/shell/shell.contribution.ts
similarity index 100%
rename from monaco-languages/src/shell/shell.contribution.ts
rename to src/basic-languages/shell/shell.contribution.ts
diff --git a/monaco-languages/src/shell/shell.test.ts b/src/basic-languages/shell/shell.test.ts
similarity index 100%
rename from monaco-languages/src/shell/shell.test.ts
rename to src/basic-languages/shell/shell.test.ts
diff --git a/monaco-languages/src/shell/shell.ts b/src/basic-languages/shell/shell.ts
similarity index 98%
rename from monaco-languages/src/shell/shell.ts
rename to src/basic-languages/shell/shell.ts
index f7b6a6c3..20a465a1 100644
--- a/monaco-languages/src/shell/shell.ts
+++ b/src/basic-languages/shell/shell.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/solidity/solidity.contribution.ts b/src/basic-languages/solidity/solidity.contribution.ts
similarity index 100%
rename from monaco-languages/src/solidity/solidity.contribution.ts
rename to src/basic-languages/solidity/solidity.contribution.ts
diff --git a/monaco-languages/src/solidity/solidity.test.ts b/src/basic-languages/solidity/solidity.test.ts
similarity index 100%
rename from monaco-languages/src/solidity/solidity.test.ts
rename to src/basic-languages/solidity/solidity.test.ts
diff --git a/monaco-languages/src/solidity/solidity.ts b/src/basic-languages/solidity/solidity.ts
similarity index 99%
rename from monaco-languages/src/solidity/solidity.ts
rename to src/basic-languages/solidity/solidity.ts
index a69a646b..2637e32f 100644
--- a/monaco-languages/src/solidity/solidity.ts
+++ b/src/basic-languages/solidity/solidity.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/sophia/sophia.contribution.ts b/src/basic-languages/sophia/sophia.contribution.ts
similarity index 100%
rename from monaco-languages/src/sophia/sophia.contribution.ts
rename to src/basic-languages/sophia/sophia.contribution.ts
diff --git a/monaco-languages/src/sophia/sophia.test.ts b/src/basic-languages/sophia/sophia.test.ts
similarity index 100%
rename from monaco-languages/src/sophia/sophia.test.ts
rename to src/basic-languages/sophia/sophia.test.ts
diff --git a/monaco-languages/src/sophia/sophia.ts b/src/basic-languages/sophia/sophia.ts
similarity index 98%
rename from monaco-languages/src/sophia/sophia.ts
rename to src/basic-languages/sophia/sophia.ts
index 2273a730..91df64be 100644
--- a/monaco-languages/src/sophia/sophia.ts
+++ b/src/basic-languages/sophia/sophia.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/sparql/sparql.contribution.ts b/src/basic-languages/sparql/sparql.contribution.ts
similarity index 100%
rename from monaco-languages/src/sparql/sparql.contribution.ts
rename to src/basic-languages/sparql/sparql.contribution.ts
diff --git a/monaco-languages/src/sparql/sparql.test.ts b/src/basic-languages/sparql/sparql.test.ts
similarity index 100%
rename from monaco-languages/src/sparql/sparql.test.ts
rename to src/basic-languages/sparql/sparql.test.ts
diff --git a/monaco-languages/src/sparql/sparql.ts b/src/basic-languages/sparql/sparql.ts
similarity index 100%
rename from monaco-languages/src/sparql/sparql.ts
rename to src/basic-languages/sparql/sparql.ts
diff --git a/monaco-languages/src/sql/keywords.js b/src/basic-languages/sql/keywords.js
similarity index 100%
rename from monaco-languages/src/sql/keywords.js
rename to src/basic-languages/sql/keywords.js
diff --git a/monaco-languages/src/sql/sql.contribution.ts b/src/basic-languages/sql/sql.contribution.ts
similarity index 100%
rename from monaco-languages/src/sql/sql.contribution.ts
rename to src/basic-languages/sql/sql.contribution.ts
diff --git a/monaco-languages/src/sql/sql.test.ts b/src/basic-languages/sql/sql.test.ts
similarity index 100%
rename from monaco-languages/src/sql/sql.test.ts
rename to src/basic-languages/sql/sql.test.ts
diff --git a/monaco-languages/src/sql/sql.ts b/src/basic-languages/sql/sql.ts
similarity index 99%
rename from monaco-languages/src/sql/sql.ts
rename to src/basic-languages/sql/sql.ts
index 066d6cc4..05833633 100644
--- a/monaco-languages/src/sql/sql.ts
+++ b/src/basic-languages/sql/sql.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/st/st.contribution.ts b/src/basic-languages/st/st.contribution.ts
similarity index 100%
rename from monaco-languages/src/st/st.contribution.ts
rename to src/basic-languages/st/st.contribution.ts
diff --git a/monaco-languages/src/st/st.test.ts b/src/basic-languages/st/st.test.ts
similarity index 100%
rename from monaco-languages/src/st/st.test.ts
rename to src/basic-languages/st/st.test.ts
diff --git a/monaco-languages/src/st/st.ts b/src/basic-languages/st/st.ts
similarity index 99%
rename from monaco-languages/src/st/st.ts
rename to src/basic-languages/st/st.ts
index a5d0aa56..fe76f2f1 100644
--- a/monaco-languages/src/st/st.ts
+++ b/src/basic-languages/st/st.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/swift/swift.contribution.ts b/src/basic-languages/swift/swift.contribution.ts
similarity index 100%
rename from monaco-languages/src/swift/swift.contribution.ts
rename to src/basic-languages/swift/swift.contribution.ts
diff --git a/monaco-languages/src/swift/swift.test.ts b/src/basic-languages/swift/swift.test.ts
similarity index 100%
rename from monaco-languages/src/swift/swift.test.ts
rename to src/basic-languages/swift/swift.test.ts
diff --git a/monaco-languages/src/swift/swift.ts b/src/basic-languages/swift/swift.ts
similarity index 98%
rename from monaco-languages/src/swift/swift.ts
rename to src/basic-languages/swift/swift.ts
index 12a7a9fa..2ecef407 100644
--- a/monaco-languages/src/swift/swift.ts
+++ b/src/basic-languages/swift/swift.ts
@@ -2,7 +2,7 @@
* Copyright (C) David Owens II, owensd.io. All rights reserved.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/systemverilog/systemverilog.contribution.ts b/src/basic-languages/systemverilog/systemverilog.contribution.ts
similarity index 100%
rename from monaco-languages/src/systemverilog/systemverilog.contribution.ts
rename to src/basic-languages/systemverilog/systemverilog.contribution.ts
diff --git a/monaco-languages/src/systemverilog/systemverilog.test.ts b/src/basic-languages/systemverilog/systemverilog.test.ts
similarity index 100%
rename from monaco-languages/src/systemverilog/systemverilog.test.ts
rename to src/basic-languages/systemverilog/systemverilog.test.ts
diff --git a/monaco-languages/src/systemverilog/systemverilog.ts b/src/basic-languages/systemverilog/systemverilog.ts
similarity index 99%
rename from monaco-languages/src/systemverilog/systemverilog.ts
rename to src/basic-languages/systemverilog/systemverilog.ts
index 15064f1d..761f83d5 100644
--- a/monaco-languages/src/systemverilog/systemverilog.ts
+++ b/src/basic-languages/systemverilog/systemverilog.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/tcl/tcl.contribution.ts b/src/basic-languages/tcl/tcl.contribution.ts
similarity index 100%
rename from monaco-languages/src/tcl/tcl.contribution.ts
rename to src/basic-languages/tcl/tcl.contribution.ts
diff --git a/monaco-languages/src/tcl/tcl.test.ts b/src/basic-languages/tcl/tcl.test.ts
similarity index 100%
rename from monaco-languages/src/tcl/tcl.test.ts
rename to src/basic-languages/tcl/tcl.test.ts
diff --git a/monaco-languages/src/tcl/tcl.ts b/src/basic-languages/tcl/tcl.ts
similarity index 98%
rename from monaco-languages/src/tcl/tcl.ts
rename to src/basic-languages/tcl/tcl.ts
index 1806f665..392b3cc4 100644
--- a/monaco-languages/src/tcl/tcl.ts
+++ b/src/basic-languages/tcl/tcl.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
brackets: [
diff --git a/monaco-languages/src/test/testRunner.ts b/src/basic-languages/test/testRunner.ts
similarity index 96%
rename from monaco-languages/src/test/testRunner.ts
rename to src/basic-languages/test/testRunner.ts
index 859cd408..0ceabccc 100644
--- a/monaco-languages/src/test/testRunner.ts
+++ b/src/basic-languages/test/testRunner.ts
@@ -6,7 +6,7 @@
import '../monaco.contribution';
import { loadLanguage } from '../_.contribution';
import * as test from 'tape';
-import { editor } from '../fillers/monaco-editor-core';
+import { editor } from '../../fillers/monaco-editor-core';
export interface IRelaxedToken {
startIndex: number;
diff --git a/monaco-languages/src/twig/twig.contribution.ts b/src/basic-languages/twig/twig.contribution.ts
similarity index 100%
rename from monaco-languages/src/twig/twig.contribution.ts
rename to src/basic-languages/twig/twig.contribution.ts
diff --git a/monaco-languages/src/twig/twig.test.ts b/src/basic-languages/twig/twig.test.ts
similarity index 100%
rename from monaco-languages/src/twig/twig.test.ts
rename to src/basic-languages/twig/twig.test.ts
diff --git a/monaco-languages/src/twig/twig.ts b/src/basic-languages/twig/twig.ts
similarity index 99%
rename from monaco-languages/src/twig/twig.ts
rename to src/basic-languages/twig/twig.ts
index 455b1c40..30a05eb7 100644
--- a/monaco-languages/src/twig/twig.ts
+++ b/src/basic-languages/twig/twig.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\$\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\s]+)/g,
diff --git a/monaco-languages/src/typescript/typescript.contribution.ts b/src/basic-languages/typescript/typescript.contribution.ts
similarity index 100%
rename from monaco-languages/src/typescript/typescript.contribution.ts
rename to src/basic-languages/typescript/typescript.contribution.ts
diff --git a/monaco-languages/src/typescript/typescript.test.ts b/src/basic-languages/typescript/typescript.test.ts
similarity index 100%
rename from monaco-languages/src/typescript/typescript.test.ts
rename to src/basic-languages/typescript/typescript.test.ts
diff --git a/monaco-languages/src/typescript/typescript.ts b/src/basic-languages/typescript/typescript.ts
similarity index 99%
rename from monaco-languages/src/typescript/typescript.ts
rename to src/basic-languages/typescript/typescript.ts
index 9bf81ebc..6e8ba435 100644
--- a/monaco-languages/src/typescript/typescript.ts
+++ b/src/basic-languages/typescript/typescript.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import { languages } from '../fillers/monaco-editor-core';
+import { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
wordPattern:
diff --git a/monaco-languages/src/vb/vb.contribution.ts b/src/basic-languages/vb/vb.contribution.ts
similarity index 100%
rename from monaco-languages/src/vb/vb.contribution.ts
rename to src/basic-languages/vb/vb.contribution.ts
diff --git a/monaco-languages/src/vb/vb.test.ts b/src/basic-languages/vb/vb.test.ts
similarity index 100%
rename from monaco-languages/src/vb/vb.test.ts
rename to src/basic-languages/vb/vb.test.ts
diff --git a/monaco-languages/src/vb/vb.ts b/src/basic-languages/vb/vb.ts
similarity index 99%
rename from monaco-languages/src/vb/vb.ts
rename to src/basic-languages/vb/vb.ts
index f6e8a7c9..032ee6e6 100644
--- a/monaco-languages/src/vb/vb.ts
+++ b/src/basic-languages/vb/vb.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/xml/xml.contribution.ts b/src/basic-languages/xml/xml.contribution.ts
similarity index 100%
rename from monaco-languages/src/xml/xml.contribution.ts
rename to src/basic-languages/xml/xml.contribution.ts
diff --git a/monaco-languages/src/xml/xml.test.ts b/src/basic-languages/xml/xml.test.ts
similarity index 100%
rename from monaco-languages/src/xml/xml.test.ts
rename to src/basic-languages/xml/xml.test.ts
diff --git a/monaco-languages/src/xml/xml.ts b/src/basic-languages/xml/xml.ts
similarity index 97%
rename from monaco-languages/src/xml/xml.ts
rename to src/basic-languages/xml/xml.ts
index 593fd645..016fc57c 100644
--- a/monaco-languages/src/xml/xml.ts
+++ b/src/basic-languages/xml/xml.ts
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import { languages } from '../fillers/monaco-editor-core';
+import { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/yaml/yaml.contribution.ts b/src/basic-languages/yaml/yaml.contribution.ts
similarity index 100%
rename from monaco-languages/src/yaml/yaml.contribution.ts
rename to src/basic-languages/yaml/yaml.contribution.ts
diff --git a/monaco-languages/src/yaml/yaml.test.ts b/src/basic-languages/yaml/yaml.test.ts
similarity index 100%
rename from monaco-languages/src/yaml/yaml.test.ts
rename to src/basic-languages/yaml/yaml.test.ts
diff --git a/monaco-languages/src/yaml/yaml.ts b/src/basic-languages/yaml/yaml.ts
similarity index 98%
rename from monaco-languages/src/yaml/yaml.ts
rename to src/basic-languages/yaml/yaml.ts
index 27cee7d3..35095592 100644
--- a/monaco-languages/src/yaml/yaml.ts
+++ b/src/basic-languages/yaml/yaml.ts
@@ -1,4 +1,4 @@
-import type { languages } from '../fillers/monaco-editor-core';
+import type { languages } from '../../fillers/monaco-editor-core';
export const conf: languages.LanguageConfiguration = {
comments: {
diff --git a/monaco-languages/src/fillers/monaco-editor-core-amd.ts b/src/fillers/monaco-editor-core-amd.ts
similarity index 100%
rename from monaco-languages/src/fillers/monaco-editor-core-amd.ts
rename to src/fillers/monaco-editor-core-amd.ts