From b3f2986d69a4555647c4ef3721661135f03c8540 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Sat, 13 Nov 2021 00:04:23 +0100 Subject: [PATCH 01/10] Move css sources into `/src/` --- .prettierignore | 3 +- {monaco-css => build}/build.js | 35 ++-- build/utils.js | 127 +++++++++++-- monaco-css/monaco.d.ts | 171 ------------------ monaco-editor/metadata.js | 8 +- monaco-editor/typedoc/monaco.d.ts | 1 - .../website/playground/monaco.d.ts.txt | 1 - package.json | 4 +- {monaco-css/src => src/css}/css.worker.ts | 0 {monaco-css/src => src/css}/cssMode.ts | 2 +- {monaco-css/src => src/css}/cssWorker.ts | 2 +- .../src => src/css}/languageFeatures.ts | 2 +- .../src => src/css}/monaco.contribution.ts | 2 +- {monaco-css/src => src/css}/workerManager.ts | 2 +- .../src => src}/fillers/monaco-editor-core.ts | 0 {monaco-css/src => src}/tsconfig.json | 0 16 files changed, 136 insertions(+), 224 deletions(-) rename {monaco-css => build}/build.js (52%) delete mode 100644 monaco-css/monaco.d.ts rename {monaco-css/src => src/css}/css.worker.ts (100%) rename {monaco-css/src => src/css}/cssMode.ts (97%) rename {monaco-css/src => src/css}/cssWorker.ts (99%) rename {monaco-css/src => src/css}/languageFeatures.ts (99%) rename {monaco-css/src => src/css}/monaco.contribution.ts (99%) rename {monaco-css/src => src/css}/workerManager.ts (97%) rename {monaco-css/src => src}/fillers/monaco-editor-core.ts (100%) rename {monaco-css/src => src}/tsconfig.json (100%) diff --git a/.prettierignore b/.prettierignore index 0a35dc01..d8a19f85 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,5 +1,4 @@ -/monaco-css/out/ -/monaco-css/release/ +/out/ /monaco-editor-samples/browser-esm-parcel/.cache/ /monaco-editor-samples/browser-esm-parcel/dist/ /monaco-editor-samples/browser-esm-webpack/dist/*.js diff --git a/monaco-css/build.js b/build/build.js similarity index 52% rename from monaco-css/build.js rename to build/build.js index 88aa7ee1..4d47937d 100644 --- a/monaco-css/build.js +++ b/build/build.js @@ -5,37 +5,36 @@ //@ts-check -const { removeDir, tsc, dts, buildESM, buildAMD } = require('../build/utils'); +const { removeDir, tsc, dts, buildESM2, buildAMD2 } = require('../build/utils'); -removeDir(`monaco-css/release`); -removeDir(`monaco-css/out`); +removeDir(`out`); -tsc(`monaco-css/src/tsconfig.json`); +tsc(`src/tsconfig.json`); dts( - `monaco-css/out/amd/monaco.contribution.d.ts`, - `monaco-css/monaco.d.ts`, + `out/amd/css/monaco.contribution.d.ts`, + `out/release/css/monaco.d.ts`, 'monaco.languages.css' ); -buildESM({ - base: 'monaco-css', - entryPoints: ['src/monaco.contribution.ts', 'src/cssMode.ts', 'src/css.worker.ts'], +buildESM2({ + base: 'css', + entryPoints: ['src/css/monaco.contribution.ts', 'src/css/cssMode.ts', 'src/css/css.worker.ts'], external: ['monaco-editor-core', '*/cssMode'] }); -buildAMD({ - base: 'monaco-css', - entryPoint: 'src/monaco.contribution.ts', +buildAMD2({ + base: 'css', + entryPoint: 'src/css/monaco.contribution.ts', amdModuleId: 'vs/language/css/monaco.contribution', amdDependencies: ['vs/editor/editor.api'] }); -buildAMD({ - base: 'monaco-css', - entryPoint: 'src/cssMode.ts', +buildAMD2({ + base: 'css', + entryPoint: 'src/css/cssMode.ts', amdModuleId: 'vs/language/css/cssMode' }); -buildAMD({ - base: 'monaco-css', - entryPoint: 'src/cssWorker.ts', +buildAMD2({ + base: 'css', + entryPoint: 'src/css/cssWorker.ts', amdModuleId: 'vs/language/css/cssWorker' }); diff --git a/build/utils.js b/build/utils.js index ce46a8d7..cb1da279 100644 --- a/build/utils.js +++ b/build/utils.js @@ -13,6 +13,25 @@ const alias = require('esbuild-plugin-alias'); const REPO_ROOT = path.join(__dirname, '..'); +/** + * @param {string} dirname + */ +function ensureDir(dirname) { + /** @type {string[]} */ + const dirs = []; + + while (dirname.length > REPO_ROOT.length) { + dirs.push(dirname); + dirname = path.dirname(dirname); + } + dirs.reverse(); + dirs.forEach(function (dir) { + try { + fs.mkdirSync(dir); + } catch (err) {} + }); +} + /** * Copy a file. * @@ -23,24 +42,7 @@ function copyFile(_source, _destination) { const source = path.join(REPO_ROOT, _source); const destination = path.join(REPO_ROOT, _destination); - // ensure target dir - (function () { - /** @type {string[]} */ - const dirs = []; - /** @type {string} */ - let dirname = path.dirname(destination); - while (dirname.length > REPO_ROOT.length) { - dirs.push(dirname); - dirname = path.dirname(dirname); - } - dirs.reverse(); - dirs.forEach(function (dir) { - try { - fs.mkdirSync(dir); - } catch (err) {} - }); - })(); - + ensureDir(path.dirname(destination)); fs.writeFileSync(destination, fs.readFileSync(source)); console.log(`Copied ${_source} to ${_destination}`); @@ -134,8 +136,6 @@ function dts(_source, _destination, namespace) { ` * Licensed under the MIT License. See License.txt in the project root for license information.`, ` *--------------------------------------------------------------------------------------------*/`, ``, - `/// `, - ``, `declare namespace ${namespace} {` ]; for (let line of lines) { @@ -155,6 +155,7 @@ function dts(_source, _destination, namespace) { result.push(`}`); result.push(``); + ensureDir(path.dirname(destination)); fs.writeFileSync(destination, result.join('\n')); prettier(_destination); @@ -207,6 +208,37 @@ function buildESM(options) { } exports.buildESM = buildESM; +/** + * @param {{ + * base: string; + * entryPoints: string[]; + * external: string[]; + * }} options + */ +function buildESM2(options) { + build({ + entryPoints: options.entryPoints, + bundle: true, + target: 'esnext', + format: 'esm', + define: { + AMD: 'false' + }, + banner: { + js: bundledFileHeader + }, + external: options.external, + outbase: `src/${options.base}`, + outdir: `out/release/${options.base}/esm/`, + plugins: [ + alias({ + 'vscode-nls': path.join(__dirname, 'fillers/vscode-nls.ts') + }) + ] + }); +} +exports.buildESM2 = buildESM2; + /** * @param {'dev'|'min'} type * @param {{ @@ -262,6 +294,61 @@ function buildAMD(options) { } exports.buildAMD = buildAMD; +/** + * @param {'dev'|'min'} type + * @param {{ + * base: string; + * entryPoint: string; + * amdModuleId: string; + * amdDependencies?: string[]; + * }} options + */ +function buildOneAMD2(type, options) { + /** @type {import('esbuild').BuildOptions} */ + const opts = { + entryPoints: [options.entryPoint], + bundle: true, + target: 'esnext', + format: 'iife', + define: { + AMD: 'true' + }, + globalName: 'moduleExports', + banner: { + js: `${bundledFileHeader}define("${options.amdModuleId}",[${(options.amdDependencies || []).map(dep => (`"${dep}"`)).join(',')}],()=>{` + }, + footer: { + js: 'return moduleExports;\n});' + }, + outbase: `src/${options.base}`, + outdir: `out/release/${options.base}/${type}/`, + plugins: [ + alias({ + 'vscode-nls': path.join(__dirname, '../build/fillers/vscode-nls.ts'), + 'monaco-editor-core': path.join(__dirname, '../build/fillers/monaco-editor-core-amd.ts') + }) + ] + }; + if (type === 'min') { + opts.minify = true; + } + build(opts); +} + +/** + * @param {{ + * base: string; + * entryPoint: string; + * amdModuleId: string; + * amdDependencies?: string[]; + * }} options + */ +function buildAMD2(options) { + buildOneAMD2('dev', options); + buildOneAMD2('min', options); +} +exports.buildAMD2 = buildAMD2; + function getGitVersion() { const git = path.join(REPO_ROOT, '.git'); const headPath = path.join(git, 'HEAD'); diff --git a/monaco-css/monaco.d.ts b/monaco-css/monaco.d.ts deleted file mode 100644 index dba3643a..00000000 --- a/monaco-css/monaco.d.ts +++ /dev/null @@ -1,171 +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 namespace monaco.languages.css { - export interface Options { - readonly validate?: boolean; - readonly lint?: { - readonly compatibleVendorPrefixes?: 'ignore' | 'warning' | 'error'; - readonly vendorPrefix?: 'ignore' | 'warning' | 'error'; - readonly duplicateProperties?: 'ignore' | 'warning' | 'error'; - readonly emptyRules?: 'ignore' | 'warning' | 'error'; - readonly importStatement?: 'ignore' | 'warning' | 'error'; - readonly boxModel?: 'ignore' | 'warning' | 'error'; - readonly universalSelector?: 'ignore' | 'warning' | 'error'; - readonly zeroUnits?: 'ignore' | 'warning' | 'error'; - readonly fontFaceProperties?: 'ignore' | 'warning' | 'error'; - readonly hexColorLength?: 'ignore' | 'warning' | 'error'; - readonly argumentsInColorFunction?: 'ignore' | 'warning' | 'error'; - readonly unknownProperties?: 'ignore' | 'warning' | 'error'; - readonly ieHack?: 'ignore' | 'warning' | 'error'; - readonly unknownVendorSpecificProperties?: 'ignore' | 'warning' | 'error'; - readonly propertyIgnoredDueToDisplay?: 'ignore' | 'warning' | 'error'; - readonly important?: 'ignore' | 'warning' | 'error'; - readonly float?: 'ignore' | 'warning' | 'error'; - readonly idSelector?: 'ignore' | 'warning' | 'error'; - }; - /** - * Configures the CSS data types known by the langauge service. - */ - readonly data?: CSSDataConfiguration; - } - export interface ModeConfiguration { - /** - * Defines whether the built-in completionItemProvider is enabled. - */ - readonly completionItems?: boolean; - /** - * Defines whether the built-in hoverProvider is enabled. - */ - readonly hovers?: boolean; - /** - * Defines whether the built-in documentSymbolProvider is enabled. - */ - readonly documentSymbols?: boolean; - /** - * Defines whether the built-in definitions provider is enabled. - */ - readonly definitions?: boolean; - /** - * Defines whether the built-in references provider is enabled. - */ - readonly references?: boolean; - /** - * Defines whether the built-in references provider is enabled. - */ - readonly documentHighlights?: boolean; - /** - * Defines whether the built-in rename provider is enabled. - */ - readonly rename?: boolean; - /** - * Defines whether the built-in color provider is enabled. - */ - readonly colors?: boolean; - /** - * Defines whether the built-in foldingRange provider is enabled. - */ - readonly foldingRanges?: boolean; - /** - * Defines whether the built-in diagnostic provider is enabled. - */ - readonly diagnostics?: boolean; - /** - * Defines whether the built-in selection range provider is enabled. - */ - readonly selectionRanges?: boolean; - } - export interface LanguageServiceDefaults { - readonly languageId: string; - readonly onDidChange: IEvent; - readonly modeConfiguration: ModeConfiguration; - readonly options: Options; - setOptions(options: Options): void; - setModeConfiguration(modeConfiguration: ModeConfiguration): void; - /** @deprecated Use options instead */ - readonly diagnosticsOptions: DiagnosticsOptions; - /** @deprecated Use setOptions instead */ - setDiagnosticsOptions(options: DiagnosticsOptions): void; - } - /** @deprecated Use Options instead */ - export type DiagnosticsOptions = Options; - export const cssDefaults: LanguageServiceDefaults; - export const scssDefaults: LanguageServiceDefaults; - export const lessDefaults: LanguageServiceDefaults; - export interface CSSDataConfiguration { - /** - * Defines whether the standard CSS properties, at-directives, pseudoClasses and pseudoElements are shown. - */ - useDefaultDataProvider?: boolean; - /** - * Provides a set of custom data providers. - */ - dataProviders?: { - [providerId: string]: CSSDataV1; - }; - } - /** - * Custom CSS properties, at-directives, pseudoClasses and pseudoElements - * https://github.com/microsoft/vscode-css-languageservice/blob/main/docs/customData.md - */ - export interface CSSDataV1 { - version: 1 | 1.1; - properties?: IPropertyData[]; - atDirectives?: IAtDirectiveData[]; - pseudoClasses?: IPseudoClassData[]; - pseudoElements?: IPseudoElementData[]; - } - export type EntryStatus = 'standard' | 'experimental' | 'nonstandard' | 'obsolete'; - export interface IReference { - name: string; - url: string; - } - export interface IPropertyData { - name: string; - description?: string | MarkupContent; - browsers?: string[]; - restrictions?: string[]; - status?: EntryStatus; - syntax?: string; - values?: IValueData[]; - references?: IReference[]; - relevance?: number; - } - export interface IAtDirectiveData { - name: string; - description?: string | MarkupContent; - browsers?: string[]; - status?: EntryStatus; - references?: IReference[]; - } - export interface IPseudoClassData { - name: string; - description?: string | MarkupContent; - browsers?: string[]; - status?: EntryStatus; - references?: IReference[]; - } - export interface IPseudoElementData { - name: string; - description?: string | MarkupContent; - browsers?: string[]; - status?: EntryStatus; - references?: IReference[]; - } - export interface IValueData { - name: string; - description?: string | MarkupContent; - browsers?: string[]; - status?: EntryStatus; - references?: IReference[]; - } - export interface MarkupContent { - kind: MarkupKind; - value: string; - } - export type MarkupKind = 'plaintext' | 'markdown'; -} diff --git a/monaco-editor/metadata.js b/monaco-editor/metadata.js index 81b7181e..06075d18 100644 --- a/monaco-editor/metadata.js +++ b/monaco-editor/metadata.js @@ -27,12 +27,12 @@ name: 'monaco-css', contrib: 'vs/language/css/monaco.contribution', modulePrefix: 'vs/language/css', - rootPath: './monaco-css', + rootPath: './out/release/css', 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/typedoc/monaco.d.ts b/monaco-editor/typedoc/monaco.d.ts index 13ae66a6..c6b2a23d 100644 --- a/monaco-editor/typedoc/monaco.d.ts +++ b/monaco-editor/typedoc/monaco.d.ts @@ -7352,7 +7352,6 @@ declare namespace monaco.languages.typescript { * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - declare namespace monaco.languages.css { export interface Options { readonly validate?: boolean; diff --git a/monaco-editor/website/playground/monaco.d.ts.txt b/monaco-editor/website/playground/monaco.d.ts.txt index 13ae66a6..c6b2a23d 100644 --- a/monaco-editor/website/playground/monaco.d.ts.txt +++ b/monaco-editor/website/playground/monaco.d.ts.txt @@ -7352,7 +7352,6 @@ declare namespace monaco.languages.typescript { * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - declare namespace monaco.languages.css { export interface Options { readonly validate?: boolean; diff --git a/package.json b/package.json index 9a6de081..e79f585b 100644 --- a/package.json +++ b/package.json @@ -8,12 +8,12 @@ "scripts": { "simpleserver": "gulp simpleserver", "import-typescript": "node ./monaco-typescript/importTypescript", - "watch-css": "tsc -w -p ./monaco-css/src", + "watch-src": "tsc -w -p ./src", "watch-html": "tsc -w -p ./monaco-html/src", "watch-json": "tsc -w -p ./monaco-json/src", "watch-languages": "tsc -w -p ./monaco-languages/src", "watch-typescript": "tsc -w -p ./monaco-typescript/src", - "watch": "npm-run-all -lp watch-css watch-html watch-json watch-languages watch-typescript", + "watch": "npm-run-all -lp watch-src watch-html watch-json watch-languages watch-typescript", "release-css": "node ./monaco-css/build", "release-html": "node ./monaco-html/build", "release-json": "node ./monaco-json/build", diff --git a/monaco-css/src/css.worker.ts b/src/css/css.worker.ts similarity index 100% rename from monaco-css/src/css.worker.ts rename to src/css/css.worker.ts diff --git a/monaco-css/src/cssMode.ts b/src/css/cssMode.ts similarity index 97% rename from monaco-css/src/cssMode.ts rename to src/css/cssMode.ts index ec3ea260..ce475e8d 100644 --- a/monaco-css/src/cssMode.ts +++ b/src/css/cssMode.ts @@ -7,7 +7,7 @@ import { WorkerManager } from './workerManager'; import type { CSSWorker } from './cssWorker'; import { LanguageServiceDefaults } from './monaco.contribution'; import * as languageFeatures from './languageFeatures'; -import { Uri, IDisposable, languages } from './fillers/monaco-editor-core'; +import { Uri, IDisposable, languages } from '../fillers/monaco-editor-core'; export function setupMode(defaults: LanguageServiceDefaults): IDisposable { const disposables: IDisposable[] = []; diff --git a/monaco-css/src/cssWorker.ts b/src/css/cssWorker.ts similarity index 99% rename from monaco-css/src/cssWorker.ts rename to src/css/cssWorker.ts index 45628043..cd8c02cc 100644 --- a/monaco-css/src/cssWorker.ts +++ b/src/css/cssWorker.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { worker } from './fillers/monaco-editor-core'; +import type { worker } from '../fillers/monaco-editor-core'; import * as cssService from 'vscode-css-languageservice'; import { Options } from './monaco.contribution'; diff --git a/monaco-css/src/languageFeatures.ts b/src/css/languageFeatures.ts similarity index 99% rename from monaco-css/src/languageFeatures.ts rename to src/css/languageFeatures.ts index 462521c8..15f6d40a 100644 --- a/monaco-css/src/languageFeatures.ts +++ b/src/css/languageFeatures.ts @@ -17,7 +17,7 @@ import { CancellationToken, IDisposable, MarkerSeverity -} from './fillers/monaco-editor-core'; +} from '../fillers/monaco-editor-core'; import { TextEdit } from 'vscode-css-languageservice'; import { InsertReplaceEdit } from 'vscode-languageserver-types'; diff --git a/monaco-css/src/monaco.contribution.ts b/src/css/monaco.contribution.ts similarity index 99% rename from monaco-css/src/monaco.contribution.ts rename to src/css/monaco.contribution.ts index 55882223..82fb127d 100644 --- a/monaco-css/src/monaco.contribution.ts +++ b/src/css/monaco.contribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as mode from './cssMode'; -import { languages, Emitter, IEvent } from './fillers/monaco-editor-core'; +import { languages, Emitter, IEvent } from '../fillers/monaco-editor-core'; export interface Options { readonly validate?: boolean; diff --git a/monaco-css/src/workerManager.ts b/src/css/workerManager.ts similarity index 97% rename from monaco-css/src/workerManager.ts rename to src/css/workerManager.ts index 335396d5..4485c638 100644 --- a/monaco-css/src/workerManager.ts +++ b/src/css/workerManager.ts @@ -5,7 +5,7 @@ import { LanguageServiceDefaults } from './monaco.contribution'; import type { CSSWorker } from './cssWorker'; -import { editor, IDisposable, Uri } from './fillers/monaco-editor-core'; +import { editor, IDisposable, Uri } from '../fillers/monaco-editor-core'; const STOP_WHEN_IDLE_FOR = 2 * 60 * 1000; // 2min diff --git a/monaco-css/src/fillers/monaco-editor-core.ts b/src/fillers/monaco-editor-core.ts similarity index 100% rename from monaco-css/src/fillers/monaco-editor-core.ts rename to src/fillers/monaco-editor-core.ts diff --git a/monaco-css/src/tsconfig.json b/src/tsconfig.json similarity index 100% rename from monaco-css/src/tsconfig.json rename to src/tsconfig.json From 88b417d421cd55a814a7bcd10025d6e8cd02ae4a Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Sat, 13 Nov 2021 00:07:01 +0100 Subject: [PATCH 02/10] Fix `package.json` scripts --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e79f585b..f14efb08 100644 --- a/package.json +++ b/package.json @@ -14,12 +14,12 @@ "watch-languages": "tsc -w -p ./monaco-languages/src", "watch-typescript": "tsc -w -p ./monaco-typescript/src", "watch": "npm-run-all -lp watch-src watch-html watch-json watch-languages watch-typescript", - "release-css": "node ./monaco-css/build", + "release-src": "node ./build/build", "release-html": "node ./monaco-html/build", "release-json": "node ./monaco-json/build", "release-languages": "node ./monaco-languages/build", "release-typescript": "node ./monaco-typescript/build", - "release-plugins": "npm-run-all -lp release-css release-html release-json release-languages release-typescript", + "release-plugins": "npm-run-all -lp release-src release-html release-json release-languages release-typescript", "test": "node ./monaco-languages/test/all.js", "gulp-release": "gulp release", "release": "npm-run-all -ls release-plugins gulp-release", From a8df4018f1a885e70505169b0ea97f0c7fb880d3 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Sat, 13 Nov 2021 19:40:20 +0100 Subject: [PATCH 03/10] Move html sources into `/src/` --- .github/workflows/ci.yml | 2 +- .prettierignore | 2 - .vscode/launch.json | 36 ++-- build/build.js | 33 +++- build/utils.js | 10 +- monaco-editor/metadata.js | 8 +- monaco-editor/typedoc/monaco.d.ts | 9 +- .../website/playground/monaco.d.ts.txt | 9 +- monaco-html/build.js | 41 ----- monaco-html/monaco.d.ts | 172 ------------------ monaco-html/src/fillers/monaco-editor-core.ts | 6 - monaco-html/src/tsconfig.json | 10 - monaco-json/monaco.d.ts | 2 - .../src/fillers/monaco-editor-core-amd.ts | 24 +-- monaco-typescript/importTypescript.js | 2 +- monaco-typescript/monaco.d.ts | 2 - package.json | 6 +- {monaco-html/src => src/html}/html.worker.ts | 0 {monaco-html/src => src/html}/htmlMode.ts | 2 +- {monaco-html/src => src/html}/htmlWorker.ts | 2 +- .../src => src/html}/languageFeatures.ts | 2 +- .../src => src/html}/monaco.contribution.ts | 2 +- .../src => src/html}/workerManager.ts | 2 +- 23 files changed, 80 insertions(+), 304 deletions(-) delete mode 100644 monaco-html/build.js delete mode 100644 monaco-html/monaco.d.ts delete mode 100644 monaco-html/src/fillers/monaco-editor-core.ts delete mode 100644 monaco-html/src/tsconfig.json rename {monaco-html/src => src/html}/html.worker.ts (100%) rename {monaco-html/src => src/html}/htmlMode.ts (98%) rename {monaco-html/src => src/html}/htmlWorker.ts (98%) rename {monaco-html/src => src/html}/languageFeatures.ts (99%) rename {monaco-html/src => src/html}/monaco.contribution.ts (99%) rename {monaco-html/src => src/html}/workerManager.ts (97%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21f9b530..3bf6c73a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: id: cacheNodeModules uses: actions/cache@v2 with: - path: "**/node_modules" + path: '**/node_modules' key: ${{ runner.os }}-cacheNodeModules-${{ hashFiles('**/package-lock.json') }} restore-keys: ${{ runner.os }}-cacheNodeModules- diff --git a/.prettierignore b/.prettierignore index d8a19f85..670c09cc 100644 --- a/.prettierignore +++ b/.prettierignore @@ -11,8 +11,6 @@ /monaco-editor/typedoc/theme/ /monaco-editor/typedoc/monaco.d.ts /monaco-editor/website/lib/ -/monaco-html/out/ -/monaco-html/release/ /monaco-editor-webpack-plugin/test/dist/*.js /monaco-json/out/ /monaco-json/release/ diff --git a/.vscode/launch.json b/.vscode/launch.json index 05c913fb..b2bf1763 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,20 +1,16 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "type": "pwa-node", - "request": "launch", - "name": "Monaco Languages Unit Tests", - "skipFiles": [ - "/**" - ], - "program": "${workspaceFolder}\\monaco-languages\\test\\all.js", - "outFiles": [ - "${workspaceFolder}/**/*.js" - ] - } - ] -} +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "pwa-node", + "request": "launch", + "name": "Monaco Languages Unit Tests", + "skipFiles": ["/**"], + "program": "${workspaceFolder}\\monaco-languages\\test\\all.js", + "outFiles": ["${workspaceFolder}/**/*.js"] + } + ] +} diff --git a/build/build.js b/build/build.js index 4d47937d..45d0f415 100644 --- a/build/build.js +++ b/build/build.js @@ -11,10 +11,11 @@ removeDir(`out`); tsc(`src/tsconfig.json`); +dts(`out/amd/css/monaco.contribution.d.ts`, `out/release/css/monaco.d.ts`, 'monaco.languages.css'); dts( - `out/amd/css/monaco.contribution.d.ts`, - `out/release/css/monaco.d.ts`, - 'monaco.languages.css' + `out/amd/html/monaco.contribution.d.ts`, + `out/release/html/monaco.d.ts`, + 'monaco.languages.html' ); buildESM2({ @@ -38,3 +39,29 @@ buildAMD2({ entryPoint: 'src/css/cssWorker.ts', amdModuleId: 'vs/language/css/cssWorker' }); + +buildESM2({ + base: 'html', + entryPoints: [ + 'src/html/monaco.contribution.ts', + 'src/html/htmlMode.ts', + 'src/html/html.worker.ts' + ], + external: ['monaco-editor-core', '*/htmlMode'] +}); +buildAMD2({ + base: 'html', + entryPoint: 'src/html/monaco.contribution.ts', + amdModuleId: 'vs/language/html/monaco.contribution', + amdDependencies: ['vs/editor/editor.api'] +}); +buildAMD2({ + base: 'html', + entryPoint: 'src/html/htmlMode.ts', + amdModuleId: 'vs/language/html/htmlMode' +}); +buildAMD2({ + base: 'html', + entryPoint: 'src/html/htmlWorker.ts', + amdModuleId: 'vs/language/html/htmlWorker' +}); diff --git a/build/utils.js b/build/utils.js index cb1da279..83290843 100644 --- a/build/utils.js +++ b/build/utils.js @@ -186,7 +186,7 @@ exports.build = build; */ function buildESM(options) { build({ - entryPoints: options.entryPoints.map(e => (`${options.base}/${e}`)), + entryPoints: options.entryPoints.map((e) => `${options.base}/${e}`), bundle: true, target: 'esnext', format: 'esm', @@ -260,7 +260,9 @@ function buildOneAMD(type, options) { }, globalName: 'moduleExports', banner: { - js: `${bundledFileHeader}define("${options.amdModuleId}",[${(options.amdDependencies || []).map(dep => (`"${dep}"`)).join(',')}],()=>{` + js: `${bundledFileHeader}define("${options.amdModuleId}",[${(options.amdDependencies || []) + .map((dep) => `"${dep}"`) + .join(',')}],()=>{` }, footer: { js: 'return moduleExports;\n});' @@ -315,7 +317,9 @@ function buildOneAMD2(type, options) { }, globalName: 'moduleExports', banner: { - js: `${bundledFileHeader}define("${options.amdModuleId}",[${(options.amdDependencies || []).map(dep => (`"${dep}"`)).join(',')}],()=>{` + js: `${bundledFileHeader}define("${options.amdModuleId}",[${(options.amdDependencies || []) + .map((dep) => `"${dep}"`) + .join(',')}],()=>{` }, footer: { js: 'return moduleExports;\n});' diff --git a/monaco-editor/metadata.js b/monaco-editor/metadata.js index 06075d18..7d971078 100644 --- a/monaco-editor/metadata.js +++ b/monaco-editor/metadata.js @@ -51,12 +51,12 @@ name: 'monaco-html', contrib: 'vs/language/html/monaco.contribution', modulePrefix: 'vs/language/html', - rootPath: './monaco-html', + rootPath: './out/release/html', 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/typedoc/monaco.d.ts b/monaco-editor/typedoc/monaco.d.ts index c6b2a23d..73d54aad 100644 --- a/monaco-editor/typedoc/monaco.d.ts +++ b/monaco-editor/typedoc/monaco.d.ts @@ -6910,7 +6910,6 @@ declare namespace monaco.worker { * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - declare namespace monaco.languages.typescript { export enum ModuleKind { None = 0, @@ -7522,7 +7521,6 @@ declare namespace monaco.languages.css { * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - declare namespace monaco.languages.json { export interface DiagnosticsOptions { /** @@ -7635,7 +7633,6 @@ declare namespace monaco.languages.json { * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - declare namespace monaco.languages.html { export interface HTMLFormatConfiguration { readonly tabSize: number; @@ -7742,11 +7739,7 @@ declare namespace monaco.languages.html { * Use this method to register additional language ids with a HTML service. * The language server has to be registered before an editor model is opened. */ - export function registerHTMLLanguageService( - languageId: string, - options?: Options, - modeConfiguration?: ModeConfiguration - ): LanguageServiceRegistration; + export function registerHTMLLanguageService(languageId: string, options?: Options, modeConfiguration?: ModeConfiguration): LanguageServiceRegistration; export interface HTMLDataConfiguration { /** * Defines whether the standard HTML tags and attributes are shown diff --git a/monaco-editor/website/playground/monaco.d.ts.txt b/monaco-editor/website/playground/monaco.d.ts.txt index c6b2a23d..73d54aad 100644 --- a/monaco-editor/website/playground/monaco.d.ts.txt +++ b/monaco-editor/website/playground/monaco.d.ts.txt @@ -6910,7 +6910,6 @@ declare namespace monaco.worker { * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - declare namespace monaco.languages.typescript { export enum ModuleKind { None = 0, @@ -7522,7 +7521,6 @@ declare namespace monaco.languages.css { * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - declare namespace monaco.languages.json { export interface DiagnosticsOptions { /** @@ -7635,7 +7633,6 @@ declare namespace monaco.languages.json { * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - declare namespace monaco.languages.html { export interface HTMLFormatConfiguration { readonly tabSize: number; @@ -7742,11 +7739,7 @@ declare namespace monaco.languages.html { * Use this method to register additional language ids with a HTML service. * The language server has to be registered before an editor model is opened. */ - export function registerHTMLLanguageService( - languageId: string, - options?: Options, - modeConfiguration?: ModeConfiguration - ): LanguageServiceRegistration; + export function registerHTMLLanguageService(languageId: string, options?: Options, modeConfiguration?: ModeConfiguration): LanguageServiceRegistration; export interface HTMLDataConfiguration { /** * Defines whether the standard HTML tags and attributes are shown diff --git a/monaco-html/build.js b/monaco-html/build.js deleted file mode 100644 index fd26f660..00000000 --- a/monaco-html/build.js +++ /dev/null @@ -1,41 +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 { removeDir, tsc, dts, buildESM, buildAMD } = require('../build/utils'); - -removeDir(`monaco-html/release`); -removeDir(`monaco-html/out`); - -tsc(`monaco-html/src/tsconfig.json`); - -dts( - `monaco-html/out/amd/monaco.contribution.d.ts`, - `monaco-html/monaco.d.ts`, - 'monaco.languages.html' -); - -buildESM({ - base: 'monaco-html', - entryPoints: ['src/monaco.contribution.ts', 'src/htmlMode.ts', 'src/html.worker.ts'], - external: ['monaco-editor-core', '*/htmlMode'] -}); -buildAMD({ - base: 'monaco-html', - entryPoint: 'src/monaco.contribution.ts', - amdModuleId: 'vs/language/html/monaco.contribution', - amdDependencies: ['vs/editor/editor.api'] -}); -buildAMD({ - base: 'monaco-html', - entryPoint: 'src/htmlMode.ts', - amdModuleId: 'vs/language/html/htmlMode' -}); -buildAMD({ - base: 'monaco-html', - entryPoint: 'src/htmlWorker.ts', - amdModuleId: 'vs/language/html/htmlWorker' -}); diff --git a/monaco-html/monaco.d.ts b/monaco-html/monaco.d.ts deleted file mode 100644 index 9e8d1f41..00000000 --- a/monaco-html/monaco.d.ts +++ /dev/null @@ -1,172 +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 namespace monaco.languages.html { - export interface HTMLFormatConfiguration { - readonly tabSize: number; - readonly insertSpaces: boolean; - readonly wrapLineLength: number; - readonly unformatted: string; - readonly contentUnformatted: string; - readonly indentInnerHtml: boolean; - readonly preserveNewLines: boolean; - readonly maxPreserveNewLines: number; - readonly indentHandlebars: boolean; - readonly endWithNewline: boolean; - readonly extraLiners: string; - readonly wrapAttributes: 'auto' | 'force' | 'force-aligned' | 'force-expand-multiline'; - } - export interface CompletionConfiguration { - readonly [providerId: string]: boolean; - } - export interface Options { - /** - * If set, comments are tolerated. If set to false, syntax errors will be emitted for comments. - */ - readonly format?: HTMLFormatConfiguration; - /** - * A list of known schemas and/or associations of schemas to file names. - */ - readonly suggest?: CompletionConfiguration; - /** - * Configures the HTML data types known by the HTML langauge service. - */ - readonly data?: HTMLDataConfiguration; - } - export interface ModeConfiguration { - /** - * Defines whether the built-in completionItemProvider is enabled. - */ - readonly completionItems?: boolean; - /** - * Defines whether the built-in hoverProvider is enabled. - */ - readonly hovers?: boolean; - /** - * Defines whether the built-in documentSymbolProvider is enabled. - */ - readonly documentSymbols?: boolean; - /** - * Defines whether the built-in definitions provider is enabled. - */ - readonly links?: boolean; - /** - * Defines whether the built-in references provider is enabled. - */ - readonly documentHighlights?: boolean; - /** - * Defines whether the built-in rename provider is enabled. - */ - readonly rename?: boolean; - /** - * Defines whether the built-in color provider is enabled. - */ - readonly colors?: boolean; - /** - * Defines whether the built-in foldingRange provider is enabled. - */ - readonly foldingRanges?: boolean; - /** - * Defines whether the built-in diagnostic provider is enabled. - */ - readonly diagnostics?: boolean; - /** - * Defines whether the built-in selection range provider is enabled. - */ - readonly selectionRanges?: boolean; - /** - * Defines whether the built-in documentFormattingEdit provider is enabled. - */ - readonly documentFormattingEdits?: boolean; - /** - * Defines whether the built-in documentRangeFormattingEdit provider is enabled. - */ - readonly documentRangeFormattingEdits?: boolean; - } - export interface LanguageServiceDefaults { - readonly languageId: string; - readonly modeConfiguration: ModeConfiguration; - readonly onDidChange: IEvent; - readonly options: Options; - setOptions(options: Options): void; - setModeConfiguration(modeConfiguration: ModeConfiguration): void; - } - export const htmlLanguageService: LanguageServiceRegistration; - export const htmlDefaults: LanguageServiceDefaults; - export const handlebarLanguageService: LanguageServiceRegistration; - export const handlebarDefaults: LanguageServiceDefaults; - export const razorLanguageService: LanguageServiceRegistration; - export const razorDefaults: LanguageServiceDefaults; - export interface LanguageServiceRegistration extends IDisposable { - readonly defaults: LanguageServiceDefaults; - } - /** - * Registers a new HTML language service for the languageId. - * Note: 'html', 'handlebar' and 'razor' are registered by default. - * - * Use this method to register additional language ids with a HTML service. - * The language server has to be registered before an editor model is opened. - */ - export function registerHTMLLanguageService( - languageId: string, - options?: Options, - modeConfiguration?: ModeConfiguration - ): LanguageServiceRegistration; - export interface HTMLDataConfiguration { - /** - * Defines whether the standard HTML tags and attributes are shown - */ - readonly useDefaultDataProvider?: boolean; - /** - * Provides a set of custom data providers. - */ - readonly dataProviders?: { - [providerId: string]: HTMLDataV1; - }; - } - /** - * Custom HTML tags attributes and attribute values - * https://github.com/microsoft/vscode-html-languageservice/blob/main/docs/customData.md - */ - export interface HTMLDataV1 { - readonly version: 1 | 1.1; - readonly tags?: ITagData[]; - readonly globalAttributes?: IAttributeData[]; - readonly valueSets?: IValueSet[]; - } - export interface IReference { - readonly name: string; - readonly url: string; - } - export interface ITagData { - readonly name: string; - readonly description?: string | MarkupContent; - readonly attributes: IAttributeData[]; - readonly references?: IReference[]; - } - export interface IAttributeData { - readonly name: string; - readonly description?: string | MarkupContent; - readonly valueSet?: string; - readonly values?: IValueData[]; - readonly references?: IReference[]; - } - export interface IValueData { - readonly name: string; - readonly description?: string | MarkupContent; - readonly references?: IReference[]; - } - export interface IValueSet { - readonly name: string; - readonly values: IValueData[]; - } - export interface MarkupContent { - readonly kind: MarkupKind; - readonly value: string; - } - export type MarkupKind = 'plaintext' | 'markdown'; -} diff --git a/monaco-html/src/fillers/monaco-editor-core.ts b/monaco-html/src/fillers/monaco-editor-core.ts deleted file mode 100644 index cd996aa7..00000000 --- a/monaco-html/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-html/src/tsconfig.json b/monaco-html/src/tsconfig.json deleted file mode 100644 index 707f714d..00000000 --- a/monaco-html/src/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "compilerOptions": { - "module": "amd", - "moduleResolution": "node", - "outDir": "../out/amd", - "declaration": true, - "target": "es5", - "lib": ["dom", "es5", "es2015.collection", "es2015.promise", "es2015.iterable"] - } -} diff --git a/monaco-json/monaco.d.ts b/monaco-json/monaco.d.ts index 3198bd71..ca459ec6 100644 --- a/monaco-json/monaco.d.ts +++ b/monaco-json/monaco.d.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// - declare namespace monaco.languages.json { export interface DiagnosticsOptions { /** diff --git a/monaco-languages/src/fillers/monaco-editor-core-amd.ts b/monaco-languages/src/fillers/monaco-editor-core-amd.ts index 6e27a8fb..0e8a7e3f 100644 --- a/monaco-languages/src/fillers/monaco-editor-core-amd.ts +++ b/monaco-languages/src/fillers/monaco-editor-core-amd.ts @@ -1,12 +1,12 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -// Resolves with the global monaco API - -declare var define: any; - -define([], function () { - return (self).monaco; -}); +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +// Resolves with the global monaco API + +declare var define: any; + +define([], function () { + return (self).monaco; +}); diff --git a/monaco-typescript/importTypescript.js b/monaco-typescript/importTypescript.js index 173735c1..039007c4 100644 --- a/monaco-typescript/importTypescript.js +++ b/monaco-typescript/importTypescript.js @@ -116,7 +116,7 @@ define("vs/language/typescript/lib/typescriptServices", [], function() { return // ╵ ~~~~ // - tsServices = tsServices.replace(/\nvar ([^ ]+) = \(this && this\.([^)]+)\) \|\|/gm, '\nvar $1 =') + tsServices = tsServices.replace(/\nvar ([^ ]+) = \(this && this\.([^)]+)\) \|\|/gm, '\nvar $1 ='); const tsServices_esm = generatedNote + diff --git a/monaco-typescript/monaco.d.ts b/monaco-typescript/monaco.d.ts index 5f817536..74a21a47 100644 --- a/monaco-typescript/monaco.d.ts +++ b/monaco-typescript/monaco.d.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// - declare namespace monaco.languages.typescript { export enum ModuleKind { None = 0, diff --git a/package.json b/package.json index f14efb08..8269dca6 100644 --- a/package.json +++ b/package.json @@ -9,17 +9,15 @@ "simpleserver": "gulp simpleserver", "import-typescript": "node ./monaco-typescript/importTypescript", "watch-src": "tsc -w -p ./src", - "watch-html": "tsc -w -p ./monaco-html/src", "watch-json": "tsc -w -p ./monaco-json/src", "watch-languages": "tsc -w -p ./monaco-languages/src", "watch-typescript": "tsc -w -p ./monaco-typescript/src", - "watch": "npm-run-all -lp watch-src watch-html watch-json watch-languages watch-typescript", + "watch": "npm-run-all -lp watch-src watch-json watch-languages watch-typescript", "release-src": "node ./build/build", - "release-html": "node ./monaco-html/build", "release-json": "node ./monaco-json/build", "release-languages": "node ./monaco-languages/build", "release-typescript": "node ./monaco-typescript/build", - "release-plugins": "npm-run-all -lp release-src release-html release-json release-languages release-typescript", + "release-plugins": "npm-run-all -lp release-src release-json release-languages release-typescript", "test": "node ./monaco-languages/test/all.js", "gulp-release": "gulp release", "release": "npm-run-all -ls release-plugins gulp-release", diff --git a/monaco-html/src/html.worker.ts b/src/html/html.worker.ts similarity index 100% rename from monaco-html/src/html.worker.ts rename to src/html/html.worker.ts diff --git a/monaco-html/src/htmlMode.ts b/src/html/htmlMode.ts similarity index 98% rename from monaco-html/src/htmlMode.ts rename to src/html/htmlMode.ts index 95b560cb..47647a3a 100644 --- a/monaco-html/src/htmlMode.ts +++ b/src/html/htmlMode.ts @@ -7,7 +7,7 @@ import { WorkerManager } from './workerManager'; import type { HTMLWorker } from './htmlWorker'; import { LanguageServiceDefaults } from './monaco.contribution'; import * as languageFeatures from './languageFeatures'; -import { Uri, IDisposable, languages } from './fillers/monaco-editor-core'; +import { Uri, IDisposable, languages } from '../fillers/monaco-editor-core'; export function setupMode1(defaults: LanguageServiceDefaults): void { const client = new WorkerManager(defaults); diff --git a/monaco-html/src/htmlWorker.ts b/src/html/htmlWorker.ts similarity index 98% rename from monaco-html/src/htmlWorker.ts rename to src/html/htmlWorker.ts index cf5cb6e5..71bc937e 100644 --- a/monaco-html/src/htmlWorker.ts +++ b/src/html/htmlWorker.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { worker } from './fillers/monaco-editor-core'; +import { worker } from '../fillers/monaco-editor-core'; import * as htmlService from 'vscode-html-languageservice'; import type { Options } from './monaco.contribution'; import { IHTMLDataProvider } from 'vscode-html-languageservice'; diff --git a/monaco-html/src/languageFeatures.ts b/src/html/languageFeatures.ts similarity index 99% rename from monaco-html/src/languageFeatures.ts rename to src/html/languageFeatures.ts index 2d6ec034..5e1caa68 100644 --- a/monaco-html/src/languageFeatures.ts +++ b/src/html/languageFeatures.ts @@ -13,7 +13,7 @@ import { Range, CancellationToken, IMarkdownString -} from './fillers/monaco-editor-core'; +} from '../fillers/monaco-editor-core'; export interface WorkerAccessor { (...more: Uri[]): Promise; diff --git a/monaco-html/src/monaco.contribution.ts b/src/html/monaco.contribution.ts similarity index 99% rename from monaco-html/src/monaco.contribution.ts rename to src/html/monaco.contribution.ts index e3320f08..30a24b2a 100644 --- a/monaco-html/src/monaco.contribution.ts +++ b/src/html/monaco.contribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as mode from './htmlMode'; -import { languages, Emitter, IEvent, IDisposable } from './fillers/monaco-editor-core'; +import { languages, Emitter, IEvent, IDisposable } from '../fillers/monaco-editor-core'; export interface HTMLFormatConfiguration { readonly tabSize: number; diff --git a/monaco-html/src/workerManager.ts b/src/html/workerManager.ts similarity index 97% rename from monaco-html/src/workerManager.ts rename to src/html/workerManager.ts index 5122168b..74094e78 100644 --- a/monaco-html/src/workerManager.ts +++ b/src/html/workerManager.ts @@ -5,7 +5,7 @@ import { LanguageServiceDefaults } from './monaco.contribution'; import type { HTMLWorker } from './htmlWorker'; -import { Uri, IDisposable, editor } from './fillers/monaco-editor-core'; +import { Uri, IDisposable, editor } from '../fillers/monaco-editor-core'; const STOP_WHEN_IDLE_FOR = 2 * 60 * 1000; // 2min From c41a5ce8aa46cb23275b8a19b17bfbef8c54955e Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Sat, 13 Nov 2021 19:46:33 +0100 Subject: [PATCH 04/10] Move json sources to `/src/` --- .prettierignore | 2 - build/build.js | 27 +++++ monaco-editor/metadata.js | 8 +- monaco-json/build.js | 41 ------- monaco-json/monaco.d.ts | 111 ------------------ monaco-json/src/fillers/monaco-editor-core.ts | 6 - monaco-json/src/tsconfig.json | 10 -- package.json | 6 +- {monaco-json/src => src/json}/json.worker.ts | 0 {monaco-json/src => src/json}/jsonMode.ts | 2 +- {monaco-json/src => src/json}/jsonWorker.ts | 2 +- .../src => src/json}/languageFeatures.ts | 2 +- .../src => src/json}/monaco.contribution.ts | 2 +- {monaco-json/src => src/json}/tokenization.ts | 2 +- .../src => src/json}/workerManager.ts | 2 +- 15 files changed, 39 insertions(+), 184 deletions(-) delete mode 100644 monaco-json/build.js delete mode 100644 monaco-json/monaco.d.ts delete mode 100644 monaco-json/src/fillers/monaco-editor-core.ts delete mode 100644 monaco-json/src/tsconfig.json rename {monaco-json/src => src/json}/json.worker.ts (100%) rename {monaco-json/src => src/json}/jsonMode.ts (98%) rename {monaco-json/src => src/json}/jsonWorker.ts (99%) rename {monaco-json/src => src/json}/languageFeatures.ts (99%) rename {monaco-json/src => src/json}/monaco.contribution.ts (98%) rename {monaco-json/src => src/json}/tokenization.ts (99%) rename {monaco-json/src => src/json}/workerManager.ts (97%) diff --git a/.prettierignore b/.prettierignore index 670c09cc..9981429a 100644 --- a/.prettierignore +++ b/.prettierignore @@ -12,8 +12,6 @@ /monaco-editor/typedoc/monaco.d.ts /monaco-editor/website/lib/ /monaco-editor-webpack-plugin/test/dist/*.js -/monaco-json/out/ -/monaco-json/release/ /monaco-languages/out/ /monaco-languages/release/ /monaco-typescript/out/ diff --git a/build/build.js b/build/build.js index 45d0f415..734158d6 100644 --- a/build/build.js +++ b/build/build.js @@ -17,6 +17,11 @@ dts( `out/release/html/monaco.d.ts`, 'monaco.languages.html' ); +dts( + `out/amd/json/monaco.contribution.d.ts`, + `out/release/json/monaco.d.ts`, + 'monaco.languages.json' +); buildESM2({ base: 'css', @@ -65,3 +70,25 @@ buildAMD2({ entryPoint: 'src/html/htmlWorker.ts', amdModuleId: 'vs/language/html/htmlWorker' }); + +buildESM2({ + base: 'json', + entryPoints: ['src/json/monaco.contribution.ts', 'src/json/jsonMode.ts', 'src/json/json.worker.ts'], + external: ['monaco-editor-core', '*/jsonMode'] +}); +buildAMD2({ + base: 'json', + entryPoint: 'src/json/monaco.contribution.ts', + amdModuleId: 'vs/language/json/monaco.contribution', + amdDependencies: ['vs/editor/editor.api'] +}); +buildAMD2({ + base: 'json', + entryPoint: 'src/json/jsonMode.ts', + amdModuleId: 'vs/language/json/jsonMode' +}); +buildAMD2({ + base: 'json', + entryPoint: 'src/json/jsonWorker.ts', + amdModuleId: 'vs/language/json/jsonWorker' +}); diff --git a/monaco-editor/metadata.js b/monaco-editor/metadata.js index 7d971078..9786f69d 100644 --- a/monaco-editor/metadata.js +++ b/monaco-editor/metadata.js @@ -39,12 +39,12 @@ name: 'monaco-json', contrib: 'vs/language/json/monaco.contribution', modulePrefix: 'vs/language/json', - rootPath: './monaco-json', + rootPath: './out/release/json', 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-json/build.js b/monaco-json/build.js deleted file mode 100644 index 148d259d..00000000 --- a/monaco-json/build.js +++ /dev/null @@ -1,41 +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 { removeDir, tsc, dts, buildESM, buildAMD } = require('../build/utils'); - -removeDir(`monaco-json/release`); -removeDir(`monaco-json/out`); - -tsc(`monaco-json/src/tsconfig.json`); - -dts( - `monaco-json/out/amd/monaco.contribution.d.ts`, - `monaco-json/monaco.d.ts`, - 'monaco.languages.json' -); - -buildESM({ - base: 'monaco-json', - entryPoints: ['src/monaco.contribution.ts', 'src/jsonMode.ts', 'src/json.worker.ts'], - external: ['monaco-editor-core', '*/jsonMode'] -}); -buildAMD({ - base: 'monaco-json', - entryPoint: 'src/monaco.contribution.ts', - amdModuleId: 'vs/language/json/monaco.contribution', - amdDependencies: ['vs/editor/editor.api'] -}); -buildAMD({ - base: 'monaco-json', - entryPoint: 'src/jsonMode.ts', - amdModuleId: 'vs/language/json/jsonMode' -}); -buildAMD({ - base: 'monaco-json', - entryPoint: 'src/jsonWorker.ts', - amdModuleId: 'vs/language/json/jsonWorker' -}); diff --git a/monaco-json/monaco.d.ts b/monaco-json/monaco.d.ts deleted file mode 100644 index ca459ec6..00000000 --- a/monaco-json/monaco.d.ts +++ /dev/null @@ -1,111 +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 namespace monaco.languages.json { - export interface DiagnosticsOptions { - /** - * If set, the validator will be enabled and perform syntax and schema based validation, - * unless `DiagnosticsOptions.schemaValidation` is set to `ignore`. - */ - readonly validate?: boolean; - /** - * If set, comments are tolerated. If set to false, syntax errors will be emitted for comments. - * `DiagnosticsOptions.allowComments` will override this setting. - */ - readonly allowComments?: boolean; - /** - * A list of known schemas and/or associations of schemas to file names. - */ - readonly schemas?: { - /** - * The URI of the schema, which is also the identifier of the schema. - */ - readonly uri: string; - /** - * A list of glob patterns that describe for which file URIs the JSON schema will be used. - * '*' and '**' wildcards are supported. Exclusion patterns start with '!'. - * For example '*.schema.json', 'package.json', '!foo*.schema.json', 'foo/**\/BADRESP.json'. - * A match succeeds when there is at least one pattern matching and last matching pattern does not start with '!'. - */ - readonly fileMatch?: string[]; - /** - * The schema for the given URI. - */ - readonly schema?: any; - }[]; - /** - * If set, the schema service would load schema content on-demand with 'fetch' if available - */ - readonly enableSchemaRequest?: boolean; - /** - * The severity of problems from schema validation. If set to 'ignore', schema validation will be skipped. If not set, 'warning' is used. - */ - readonly schemaValidation?: SeverityLevel; - /** - * The severity of problems that occurred when resolving and loading schemas. If set to 'ignore', schema resolving problems are not reported. If not set, 'warning' is used. - */ - readonly schemaRequest?: SeverityLevel; - /** - * The severity of reported trailing commas. If not set, trailing commas will be reported as errors. - */ - readonly trailingCommas?: SeverityLevel; - /** - * The severity of reported comments. If not set, 'DiagnosticsOptions.allowComments' defines whether comments are ignored or reported as errors. - */ - readonly comments?: SeverityLevel; - } - export type SeverityLevel = 'error' | 'warning' | 'ignore'; - export interface ModeConfiguration { - /** - * Defines whether the built-in documentFormattingEdit provider is enabled. - */ - readonly documentFormattingEdits?: boolean; - /** - * Defines whether the built-in documentRangeFormattingEdit provider is enabled. - */ - readonly documentRangeFormattingEdits?: boolean; - /** - * Defines whether the built-in completionItemProvider is enabled. - */ - readonly completionItems?: boolean; - /** - * Defines whether the built-in hoverProvider is enabled. - */ - readonly hovers?: boolean; - /** - * Defines whether the built-in documentSymbolProvider is enabled. - */ - readonly documentSymbols?: boolean; - /** - * Defines whether the built-in tokens provider is enabled. - */ - readonly tokens?: boolean; - /** - * Defines whether the built-in color provider is enabled. - */ - readonly colors?: boolean; - /** - * Defines whether the built-in foldingRange provider is enabled. - */ - readonly foldingRanges?: boolean; - /** - * Defines whether the built-in diagnostic provider is enabled. - */ - readonly diagnostics?: boolean; - /** - * Defines whether the built-in selection range provider is enabled. - */ - readonly selectionRanges?: boolean; - } - export interface LanguageServiceDefaults { - readonly languageId: string; - readonly onDidChange: IEvent; - readonly diagnosticsOptions: DiagnosticsOptions; - readonly modeConfiguration: ModeConfiguration; - setDiagnosticsOptions(options: DiagnosticsOptions): void; - setModeConfiguration(modeConfiguration: ModeConfiguration): void; - } - export const jsonDefaults: LanguageServiceDefaults; -} diff --git a/monaco-json/src/fillers/monaco-editor-core.ts b/monaco-json/src/fillers/monaco-editor-core.ts deleted file mode 100644 index cd996aa7..00000000 --- a/monaco-json/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-json/src/tsconfig.json b/monaco-json/src/tsconfig.json deleted file mode 100644 index 707f714d..00000000 --- a/monaco-json/src/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "compilerOptions": { - "module": "amd", - "moduleResolution": "node", - "outDir": "../out/amd", - "declaration": true, - "target": "es5", - "lib": ["dom", "es5", "es2015.collection", "es2015.promise", "es2015.iterable"] - } -} diff --git a/package.json b/package.json index 8269dca6..5f1b5038 100644 --- a/package.json +++ b/package.json @@ -9,15 +9,13 @@ "simpleserver": "gulp simpleserver", "import-typescript": "node ./monaco-typescript/importTypescript", "watch-src": "tsc -w -p ./src", - "watch-json": "tsc -w -p ./monaco-json/src", "watch-languages": "tsc -w -p ./monaco-languages/src", "watch-typescript": "tsc -w -p ./monaco-typescript/src", - "watch": "npm-run-all -lp watch-src watch-json watch-languages watch-typescript", + "watch": "npm-run-all -lp watch-src watch-languages watch-typescript", "release-src": "node ./build/build", - "release-json": "node ./monaco-json/build", "release-languages": "node ./monaco-languages/build", "release-typescript": "node ./monaco-typescript/build", - "release-plugins": "npm-run-all -lp release-src release-json release-languages release-typescript", + "release-plugins": "npm-run-all -lp release-src release-languages release-typescript", "test": "node ./monaco-languages/test/all.js", "gulp-release": "gulp release", "release": "npm-run-all -ls release-plugins gulp-release", diff --git a/monaco-json/src/json.worker.ts b/src/json/json.worker.ts similarity index 100% rename from monaco-json/src/json.worker.ts rename to src/json/json.worker.ts diff --git a/monaco-json/src/jsonMode.ts b/src/json/jsonMode.ts similarity index 98% rename from monaco-json/src/jsonMode.ts rename to src/json/jsonMode.ts index 7d66f6a0..84254c58 100644 --- a/monaco-json/src/jsonMode.ts +++ b/src/json/jsonMode.ts @@ -8,7 +8,7 @@ import type { JSONWorker } from './jsonWorker'; import { LanguageServiceDefaults } from './monaco.contribution'; import * as languageFeatures from './languageFeatures'; import { createTokenizationSupport } from './tokenization'; -import { Uri, IDisposable, languages } from './fillers/monaco-editor-core'; +import { Uri, IDisposable, languages } from '../fillers/monaco-editor-core'; export function setupMode(defaults: LanguageServiceDefaults): IDisposable { const disposables: IDisposable[] = []; diff --git a/monaco-json/src/jsonWorker.ts b/src/json/jsonWorker.ts similarity index 99% rename from monaco-json/src/jsonWorker.ts rename to src/json/jsonWorker.ts index 781b58e2..8df3fee2 100644 --- a/monaco-json/src/jsonWorker.ts +++ b/src/json/jsonWorker.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as jsonService from 'vscode-json-languageservice'; -import type { worker } from './fillers/monaco-editor-core'; +import type { worker } from '../fillers/monaco-editor-core'; import { URI } from 'vscode-uri'; import { DiagnosticsOptions } from './monaco.contribution'; diff --git a/monaco-json/src/languageFeatures.ts b/src/json/languageFeatures.ts similarity index 99% rename from monaco-json/src/languageFeatures.ts rename to src/json/languageFeatures.ts index cc6391a0..a26bd236 100644 --- a/monaco-json/src/languageFeatures.ts +++ b/src/json/languageFeatures.ts @@ -16,7 +16,7 @@ import { languages, MarkerSeverity, IMarkdownString -} from './fillers/monaco-editor-core'; +} from '../fillers/monaco-editor-core'; import * as lsTypes from 'vscode-languageserver-types'; export interface WorkerAccessor { diff --git a/monaco-json/src/monaco.contribution.ts b/src/json/monaco.contribution.ts similarity index 98% rename from monaco-json/src/monaco.contribution.ts rename to src/json/monaco.contribution.ts index 572d7afb..4487061a 100644 --- a/monaco-json/src/monaco.contribution.ts +++ b/src/json/monaco.contribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as mode from './jsonMode'; -import { Emitter, IEvent, languages } from './fillers/monaco-editor-core'; +import { Emitter, IEvent, languages } from '../fillers/monaco-editor-core'; // --- JSON configuration and defaults --------- diff --git a/monaco-json/src/tokenization.ts b/src/json/tokenization.ts similarity index 99% rename from monaco-json/src/tokenization.ts rename to src/json/tokenization.ts index bb8d7ad2..61925359 100644 --- a/monaco-json/src/tokenization.ts +++ b/src/json/tokenization.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as json from 'jsonc-parser'; -import { languages } from './fillers/monaco-editor-core'; +import { languages } from '../fillers/monaco-editor-core'; export function createTokenizationSupport(supportComments: boolean): languages.TokensProvider { return { diff --git a/monaco-json/src/workerManager.ts b/src/json/workerManager.ts similarity index 97% rename from monaco-json/src/workerManager.ts rename to src/json/workerManager.ts index 6c32e001..fcb3e77c 100644 --- a/monaco-json/src/workerManager.ts +++ b/src/json/workerManager.ts @@ -5,7 +5,7 @@ import { LanguageServiceDefaults } from './monaco.contribution'; import type { JSONWorker } from './jsonWorker'; -import { IDisposable, Uri, editor } from './fillers/monaco-editor-core'; +import { IDisposable, Uri, editor } from '../fillers/monaco-editor-core'; const STOP_WHEN_IDLE_FOR = 2 * 60 * 1000; // 2min From 8b4f06b8c50353a14740d496ee99068be219e095 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Sat, 13 Nov 2021 20:06:41 +0100 Subject: [PATCH 05/10] Move typescript sources to `/src/` --- .prettierignore | 4 +- build/build.js | 64 ++- monaco-editor/metadata.js | 8 +- monaco-editor/typedoc/monaco.d.ts | 80 +--- .../website/playground/monaco.d.ts.txt | 80 +--- monaco-typescript/.github/workflows/ci.yml | 16 - monaco-typescript/build.js | 47 -- monaco-typescript/monaco.d.ts | 440 ------------------ .../src/fillers/monaco-editor-core.ts | 6 - monaco-typescript/src/tsconfig.json | 11 - package.json | 6 +- .../typescript}/languageFeatures.ts | 2 +- .../typescript}/lib/editor.worker.d.ts | 0 .../src => src/typescript}/lib/lib.index.ts | 0 .../src => src/typescript}/lib/lib.ts | 0 .../typescript}/lib/typescriptServices-amd.js | 0 .../typescript}/lib/typescriptServices.d.ts | 0 .../typescript}/lib/typescriptServices.js | 0 .../lib/typescriptServicesMetadata.ts | 0 .../typescript}/monaco.contribution.ts | 2 +- .../src => src/typescript}/ts.worker.ts | 2 +- .../src => src/typescript}/tsMode.ts | 2 +- .../src => src/typescript}/tsWorker.ts | 2 +- .../src => src/typescript}/workerManager.ts | 2 +- 24 files changed, 107 insertions(+), 667 deletions(-) delete mode 100644 monaco-typescript/.github/workflows/ci.yml delete mode 100644 monaco-typescript/build.js delete mode 100644 monaco-typescript/monaco.d.ts delete mode 100644 monaco-typescript/src/fillers/monaco-editor-core.ts delete mode 100644 monaco-typescript/src/tsconfig.json rename {monaco-typescript/src => src/typescript}/languageFeatures.ts (99%) rename {monaco-typescript/src => src/typescript}/lib/editor.worker.d.ts (100%) rename {monaco-typescript/src => src/typescript}/lib/lib.index.ts (100%) rename {monaco-typescript/src => src/typescript}/lib/lib.ts (100%) rename {monaco-typescript/src => src/typescript}/lib/typescriptServices-amd.js (100%) rename {monaco-typescript/src => src/typescript}/lib/typescriptServices.d.ts (100%) rename {monaco-typescript/src => src/typescript}/lib/typescriptServices.js (100%) rename {monaco-typescript/src => src/typescript}/lib/typescriptServicesMetadata.ts (100%) rename {monaco-typescript/src => src/typescript}/monaco.contribution.ts (99%) rename {monaco-typescript/src => src/typescript}/ts.worker.ts (92%) rename {monaco-typescript/src => src/typescript}/tsMode.ts (98%) rename {monaco-typescript/src => src/typescript}/tsWorker.ts (99%) rename {monaco-typescript/src => src/typescript}/workerManager.ts (97%) diff --git a/.prettierignore b/.prettierignore index 9981429a..33639d99 100644 --- a/.prettierignore +++ b/.prettierignore @@ -14,7 +14,5 @@ /monaco-editor-webpack-plugin/test/dist/*.js /monaco-languages/out/ /monaco-languages/release/ -/monaco-typescript/out/ -/monaco-typescript/release/ -/monaco-typescript/src/lib/ /release/ +/src/typescript/lib/ diff --git a/build/build.js b/build/build.js index 734158d6..f247c814 100644 --- a/build/build.js +++ b/build/build.js @@ -5,12 +5,14 @@ //@ts-check -const { removeDir, tsc, dts, buildESM2, buildAMD2 } = require('../build/utils'); +const { copyFile, removeDir, tsc, dts, buildESM2, buildAMD2 } = require('../build/utils'); removeDir(`out`); tsc(`src/tsconfig.json`); +//#region Type Defintion + dts(`out/amd/css/monaco.contribution.d.ts`, `out/release/css/monaco.d.ts`, 'monaco.languages.css'); dts( `out/amd/html/monaco.contribution.d.ts`, @@ -22,6 +24,15 @@ dts( `out/release/json/monaco.d.ts`, 'monaco.languages.json' ); +dts( + `out/amd/typescript/monaco.contribution.d.ts`, + `out/release/typescript/monaco.d.ts`, + 'monaco.languages.typescript' +); + +//#endregion + +//#region css buildESM2({ base: 'css', @@ -45,6 +56,10 @@ buildAMD2({ amdModuleId: 'vs/language/css/cssWorker' }); +//#endregion + +//#region html + buildESM2({ base: 'html', entryPoints: [ @@ -71,9 +86,17 @@ buildAMD2({ amdModuleId: 'vs/language/html/htmlWorker' }); +//#endregion + +//#region json + buildESM2({ base: 'json', - entryPoints: ['src/json/monaco.contribution.ts', 'src/json/jsonMode.ts', 'src/json/json.worker.ts'], + entryPoints: [ + 'src/json/monaco.contribution.ts', + 'src/json/jsonMode.ts', + 'src/json/json.worker.ts' + ], external: ['monaco-editor-core', '*/jsonMode'] }); buildAMD2({ @@ -92,3 +115,40 @@ buildAMD2({ entryPoint: 'src/json/jsonWorker.ts', amdModuleId: 'vs/language/json/jsonWorker' }); + +//#endregion + +//#region typescript + +copyFile( + `src/typescript/lib/typescriptServices-amd.js`, + `out/amd/typescript/lib/typescriptServices.js` +); + +buildESM2({ + base: 'typescript', + entryPoints: [ + 'src/typescript/monaco.contribution.ts', + 'src/typescript/tsMode.ts', + 'src/typescript/ts.worker.ts' + ], + external: ['monaco-editor-core', '*/tsMode'] +}); +buildAMD2({ + base: 'typescript', + entryPoint: 'src/typescript/monaco.contribution.ts', + amdModuleId: 'vs/language/typescript/monaco.contribution', + amdDependencies: ['vs/editor/editor.api'] +}); +buildAMD2({ + base: 'typescript', + entryPoint: 'src/typescript/tsMode.ts', + amdModuleId: 'vs/language/typescript/tsMode' +}); +buildAMD2({ + base: 'typescript', + entryPoint: 'src/typescript/tsWorker.ts', + amdModuleId: 'vs/language/typescript/tsWorker' +}); + +//#endregion diff --git a/monaco-editor/metadata.js b/monaco-editor/metadata.js index 9786f69d..f528f61b 100644 --- a/monaco-editor/metadata.js +++ b/monaco-editor/metadata.js @@ -15,12 +15,12 @@ name: 'monaco-typescript', contrib: 'vs/language/typescript/monaco.contribution', modulePrefix: 'vs/language/typescript', - rootPath: './monaco-typescript', + rootPath: './out/release/typescript', 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/typedoc/monaco.d.ts b/monaco-editor/typedoc/monaco.d.ts index 73d54aad..bfec7b8a 100644 --- a/monaco-editor/typedoc/monaco.d.ts +++ b/monaco-editor/typedoc/monaco.d.ts @@ -6952,15 +6952,7 @@ declare namespace monaco.languages.typescript { interface MapLike { [index: string]: T; } - type CompilerOptionsValue = - | string - | number - | boolean - | (string | number)[] - | string[] - | MapLike - | null - | undefined; + type CompilerOptionsValue = string | number | boolean | (string | number)[] | string[] | MapLike | null | undefined; interface CompilerOptions { allowJs?: boolean; allowSyntheticDefaultImports?: boolean; @@ -7098,11 +7090,9 @@ declare namespace monaco.languages.typescript { category: 0 | 1 | 2 | 3; code: number; /** TypeScriptWorker removes all but the `fileName` property to avoid serializing circular JSON structures. */ - file: - | { - fileName: string; - } - | undefined; + file: { + fileName: string; + } | undefined; start: number | undefined; length: number | undefined; messageText: string | DiagnosticMessageChain; @@ -7148,12 +7138,10 @@ declare namespace monaco.languages.typescript { * files that won't be loaded as editor documents, like `jquery.d.ts`. * @param libs An array of entries to register. */ - setExtraLibs( - libs: { - content: string; - filePath?: string; - }[] - ): void; + setExtraLibs(libs: { + content: string; + filePath?: string; + }[]): void; /** * Get current TypeScript compiler options for the language service. */ @@ -7225,20 +7213,12 @@ declare namespace monaco.languages.typescript { * Get code completion details for the given file, position, and entry. * @returns `Promise` */ - getCompletionEntryDetails( - fileName: string, - position: number, - entry: string - ): Promise; + getCompletionEntryDetails(fileName: string, position: number, entry: string): Promise; /** * Get signature help items for the item at the given file and position. * @returns `Promise` */ - getSignatureHelpItems( - fileName: string, - position: number, - options: any - ): Promise; + getSignatureHelpItems(fileName: string, position: number, options: any): Promise; /** * Get quick info for the item at the given position in the file. * @returns `Promise` @@ -7248,18 +7228,12 @@ declare namespace monaco.languages.typescript { * Get other ranges which are related to the item at the given position in the file (often used for highlighting). * @returns `Promise | undefined>` */ - getOccurrencesAtPosition( - fileName: string, - position: number - ): Promise | undefined>; + getOccurrencesAtPosition(fileName: string, position: number): Promise | undefined>; /** * Get the definition of the item at the given position in the file. * @returns `Promise | undefined>` */ - getDefinitionAtPosition( - fileName: string, - position: number - ): Promise | undefined>; + getDefinitionAtPosition(fileName: string, position: number): Promise | undefined>; /** * Get references to the item at the given position in the file. * @returns `Promise` @@ -7281,34 +7255,18 @@ declare namespace monaco.languages.typescript { * @param options `typescript.FormatCodeOptions` * @returns `Promise` */ - getFormattingEditsForRange( - fileName: string, - start: number, - end: number, - options: any - ): Promise; + getFormattingEditsForRange(fileName: string, start: number, end: number, options: any): Promise; /** * Get formatting changes which should be applied after the given keystroke. * @param options `typescript.FormatCodeOptions` * @returns `Promise` */ - getFormattingEditsAfterKeystroke( - fileName: string, - postion: number, - ch: string, - options: any - ): Promise; + getFormattingEditsAfterKeystroke(fileName: string, postion: number, ch: string, options: any): Promise; /** * Get other occurrences which should be updated when renaming the item at the given file and position. * @returns `Promise` */ - findRenameLocations( - fileName: string, - positon: number, - findInStrings: boolean, - findInComments: boolean, - providePrefixAndSuffixTextForRename: boolean - ): Promise; + findRenameLocations(fileName: string, positon: number, findInStrings: boolean, findInComments: boolean, providePrefixAndSuffixTextForRename: boolean): Promise; /** * Get edits which should be applied to rename the item at the given file and position (or a failure reason). * @param options `typescript.RenameInfoOptions` @@ -7325,13 +7283,7 @@ declare namespace monaco.languages.typescript { * @param formatOptions `typescript.FormatCodeOptions` * @returns `Promise>` */ - getCodeFixesAtPosition( - fileName: string, - start: number, - end: number, - errorCodes: number[], - formatOptions: any - ): Promise>; + getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: number[], formatOptions: any): Promise>; /** * Get inlay hints in the range of the file. * @param fileName diff --git a/monaco-editor/website/playground/monaco.d.ts.txt b/monaco-editor/website/playground/monaco.d.ts.txt index 73d54aad..bfec7b8a 100644 --- a/monaco-editor/website/playground/monaco.d.ts.txt +++ b/monaco-editor/website/playground/monaco.d.ts.txt @@ -6952,15 +6952,7 @@ declare namespace monaco.languages.typescript { interface MapLike { [index: string]: T; } - type CompilerOptionsValue = - | string - | number - | boolean - | (string | number)[] - | string[] - | MapLike - | null - | undefined; + type CompilerOptionsValue = string | number | boolean | (string | number)[] | string[] | MapLike | null | undefined; interface CompilerOptions { allowJs?: boolean; allowSyntheticDefaultImports?: boolean; @@ -7098,11 +7090,9 @@ declare namespace monaco.languages.typescript { category: 0 | 1 | 2 | 3; code: number; /** TypeScriptWorker removes all but the `fileName` property to avoid serializing circular JSON structures. */ - file: - | { - fileName: string; - } - | undefined; + file: { + fileName: string; + } | undefined; start: number | undefined; length: number | undefined; messageText: string | DiagnosticMessageChain; @@ -7148,12 +7138,10 @@ declare namespace monaco.languages.typescript { * files that won't be loaded as editor documents, like `jquery.d.ts`. * @param libs An array of entries to register. */ - setExtraLibs( - libs: { - content: string; - filePath?: string; - }[] - ): void; + setExtraLibs(libs: { + content: string; + filePath?: string; + }[]): void; /** * Get current TypeScript compiler options for the language service. */ @@ -7225,20 +7213,12 @@ declare namespace monaco.languages.typescript { * Get code completion details for the given file, position, and entry. * @returns `Promise` */ - getCompletionEntryDetails( - fileName: string, - position: number, - entry: string - ): Promise; + getCompletionEntryDetails(fileName: string, position: number, entry: string): Promise; /** * Get signature help items for the item at the given file and position. * @returns `Promise` */ - getSignatureHelpItems( - fileName: string, - position: number, - options: any - ): Promise; + getSignatureHelpItems(fileName: string, position: number, options: any): Promise; /** * Get quick info for the item at the given position in the file. * @returns `Promise` @@ -7248,18 +7228,12 @@ declare namespace monaco.languages.typescript { * Get other ranges which are related to the item at the given position in the file (often used for highlighting). * @returns `Promise | undefined>` */ - getOccurrencesAtPosition( - fileName: string, - position: number - ): Promise | undefined>; + getOccurrencesAtPosition(fileName: string, position: number): Promise | undefined>; /** * Get the definition of the item at the given position in the file. * @returns `Promise | undefined>` */ - getDefinitionAtPosition( - fileName: string, - position: number - ): Promise | undefined>; + getDefinitionAtPosition(fileName: string, position: number): Promise | undefined>; /** * Get references to the item at the given position in the file. * @returns `Promise` @@ -7281,34 +7255,18 @@ declare namespace monaco.languages.typescript { * @param options `typescript.FormatCodeOptions` * @returns `Promise` */ - getFormattingEditsForRange( - fileName: string, - start: number, - end: number, - options: any - ): Promise; + getFormattingEditsForRange(fileName: string, start: number, end: number, options: any): Promise; /** * Get formatting changes which should be applied after the given keystroke. * @param options `typescript.FormatCodeOptions` * @returns `Promise` */ - getFormattingEditsAfterKeystroke( - fileName: string, - postion: number, - ch: string, - options: any - ): Promise; + getFormattingEditsAfterKeystroke(fileName: string, postion: number, ch: string, options: any): Promise; /** * Get other occurrences which should be updated when renaming the item at the given file and position. * @returns `Promise` */ - findRenameLocations( - fileName: string, - positon: number, - findInStrings: boolean, - findInComments: boolean, - providePrefixAndSuffixTextForRename: boolean - ): Promise; + findRenameLocations(fileName: string, positon: number, findInStrings: boolean, findInComments: boolean, providePrefixAndSuffixTextForRename: boolean): Promise; /** * Get edits which should be applied to rename the item at the given file and position (or a failure reason). * @param options `typescript.RenameInfoOptions` @@ -7325,13 +7283,7 @@ declare namespace monaco.languages.typescript { * @param formatOptions `typescript.FormatCodeOptions` * @returns `Promise>` */ - getCodeFixesAtPosition( - fileName: string, - start: number, - end: number, - errorCodes: number[], - formatOptions: any - ): Promise>; + getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: number[], formatOptions: any): Promise>; /** * Get inlay hints in the range of the file. * @param fileName diff --git a/monaco-typescript/.github/workflows/ci.yml b/monaco-typescript/.github/workflows/ci.yml deleted file mode 100644 index 5fc63f7c..00000000 --- a/monaco-typescript/.github/workflows/ci.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: 'CI' -on: [push, pull_request] -jobs: - build: - name: 'Builds and Compiles' - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@master - - uses: actions/setup-node@v1 - with: - node-version: '10.x' - - run: npm install - - run: npm run import-typescript - - run: npm run compile - - run: npm run prepublishOnly diff --git a/monaco-typescript/build.js b/monaco-typescript/build.js deleted file mode 100644 index fff00847..00000000 --- a/monaco-typescript/build.js +++ /dev/null @@ -1,47 +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 { copyFile, removeDir, tsc, dts, buildESM, buildAMD } = require('../build/utils'); - -removeDir(`monaco-typescript/release`); -removeDir(`monaco-typescript/out`); - -copyFile( - `monaco-typescript/src/lib/typescriptServices-amd.js`, - `monaco-typescript/out/amd/lib/typescriptServices.js` -); - -tsc(`monaco-typescript/src/tsconfig.json`); - -dts( - `monaco-typescript/out/amd/monaco.contribution.d.ts`, - `monaco-typescript/monaco.d.ts`, - 'monaco.languages.typescript' -); - -buildESM({ - base: 'monaco-typescript', - entryPoints: ['src/monaco.contribution.ts', 'src/tsMode.ts', 'src/ts.worker.ts'], - external: ['monaco-editor-core', '*/tsMode'] -}); -buildAMD({ - base: 'monaco-typescript', - entryPoint: 'src/monaco.contribution.ts', - amdModuleId: 'vs/language/typescript/monaco.contribution', - amdDependencies: ['vs/editor/editor.api'] -}); -buildAMD({ - base: 'monaco-typescript', - entryPoint: 'src/tsMode.ts', - amdModuleId: 'vs/language/typescript/tsMode' -}); -buildAMD({ - base: 'monaco-typescript', - entryPoint: 'src/tsWorker.ts', - amdModuleId: 'vs/language/typescript/tsWorker', - amdDependencies: [] -}); diff --git a/monaco-typescript/monaco.d.ts b/monaco-typescript/monaco.d.ts deleted file mode 100644 index 74a21a47..00000000 --- a/monaco-typescript/monaco.d.ts +++ /dev/null @@ -1,440 +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 namespace monaco.languages.typescript { - export enum ModuleKind { - None = 0, - CommonJS = 1, - AMD = 2, - UMD = 3, - System = 4, - ES2015 = 5, - ESNext = 99 - } - export enum JsxEmit { - None = 0, - Preserve = 1, - React = 2, - ReactNative = 3, - ReactJSX = 4, - ReactJSXDev = 5 - } - export enum NewLineKind { - CarriageReturnLineFeed = 0, - LineFeed = 1 - } - export enum ScriptTarget { - ES3 = 0, - ES5 = 1, - ES2015 = 2, - ES2016 = 3, - ES2017 = 4, - ES2018 = 5, - ES2019 = 6, - ES2020 = 7, - ESNext = 99, - JSON = 100, - Latest = 99 - } - export enum ModuleResolutionKind { - Classic = 1, - NodeJs = 2 - } - interface MapLike { - [index: string]: T; - } - type CompilerOptionsValue = - | string - | number - | boolean - | (string | number)[] - | string[] - | MapLike - | null - | undefined; - interface CompilerOptions { - allowJs?: boolean; - allowSyntheticDefaultImports?: boolean; - allowUmdGlobalAccess?: boolean; - allowUnreachableCode?: boolean; - allowUnusedLabels?: boolean; - alwaysStrict?: boolean; - baseUrl?: string; - charset?: string; - checkJs?: boolean; - declaration?: boolean; - declarationMap?: boolean; - emitDeclarationOnly?: boolean; - declarationDir?: string; - disableSizeLimit?: boolean; - disableSourceOfProjectReferenceRedirect?: boolean; - downlevelIteration?: boolean; - emitBOM?: boolean; - emitDecoratorMetadata?: boolean; - experimentalDecorators?: boolean; - forceConsistentCasingInFileNames?: boolean; - importHelpers?: boolean; - inlineSourceMap?: boolean; - inlineSources?: boolean; - isolatedModules?: boolean; - jsx?: JsxEmit; - keyofStringsOnly?: boolean; - lib?: string[]; - locale?: string; - mapRoot?: string; - maxNodeModuleJsDepth?: number; - module?: ModuleKind; - moduleResolution?: ModuleResolutionKind; - newLine?: NewLineKind; - noEmit?: boolean; - noEmitHelpers?: boolean; - noEmitOnError?: boolean; - noErrorTruncation?: boolean; - noFallthroughCasesInSwitch?: boolean; - noImplicitAny?: boolean; - noImplicitReturns?: boolean; - noImplicitThis?: boolean; - noStrictGenericChecks?: boolean; - noUnusedLocals?: boolean; - noUnusedParameters?: boolean; - noImplicitUseStrict?: boolean; - noLib?: boolean; - noResolve?: boolean; - out?: string; - outDir?: string; - outFile?: string; - paths?: MapLike; - preserveConstEnums?: boolean; - preserveSymlinks?: boolean; - project?: string; - reactNamespace?: string; - jsxFactory?: string; - composite?: boolean; - removeComments?: boolean; - rootDir?: string; - rootDirs?: string[]; - skipLibCheck?: boolean; - skipDefaultLibCheck?: boolean; - sourceMap?: boolean; - sourceRoot?: string; - strict?: boolean; - strictFunctionTypes?: boolean; - strictBindCallApply?: boolean; - strictNullChecks?: boolean; - strictPropertyInitialization?: boolean; - stripInternal?: boolean; - suppressExcessPropertyErrors?: boolean; - suppressImplicitAnyIndexErrors?: boolean; - target?: ScriptTarget; - traceResolution?: boolean; - resolveJsonModule?: boolean; - types?: string[]; - /** Paths used to compute primary types search locations */ - typeRoots?: string[]; - esModuleInterop?: boolean; - useDefineForClassFields?: boolean; - [option: string]: CompilerOptionsValue | undefined; - } - export interface DiagnosticsOptions { - noSemanticValidation?: boolean; - noSyntaxValidation?: boolean; - noSuggestionDiagnostics?: boolean; - /** - * Limit diagnostic computation to only visible files. - * Defaults to false. - */ - onlyVisible?: boolean; - diagnosticCodesToIgnore?: number[]; - } - export interface WorkerOptions { - /** A full HTTP path to a JavaScript file which adds a function `customTSWorkerFactory` to the self inside a web-worker */ - customWorkerPath?: string; - } - interface InlayHintsOptions { - readonly includeInlayParameterNameHints?: 'none' | 'literals' | 'all'; - readonly includeInlayParameterNameHintsWhenArgumentMatchesName?: boolean; - readonly includeInlayFunctionParameterTypeHints?: boolean; - readonly includeInlayVariableTypeHints?: boolean; - readonly includeInlayPropertyDeclarationTypeHints?: boolean; - readonly includeInlayFunctionLikeReturnTypeHints?: boolean; - readonly includeInlayEnumMemberValueHints?: boolean; - } - interface IExtraLib { - content: string; - version: number; - } - export interface IExtraLibs { - [path: string]: IExtraLib; - } - /** - * A linked list of formatted diagnostic messages to be used as part of a multiline message. - * It is built from the bottom up, leaving the head to be the "main" diagnostic. - */ - interface DiagnosticMessageChain { - messageText: string; - /** Diagnostic category: warning = 0, error = 1, suggestion = 2, message = 3 */ - category: 0 | 1 | 2 | 3; - code: number; - next?: DiagnosticMessageChain[]; - } - export interface Diagnostic extends DiagnosticRelatedInformation { - /** May store more in future. For now, this will simply be `true` to indicate when a diagnostic is an unused-identifier diagnostic. */ - reportsUnnecessary?: {}; - reportsDeprecated?: {}; - source?: string; - relatedInformation?: DiagnosticRelatedInformation[]; - } - export interface DiagnosticRelatedInformation { - /** Diagnostic category: warning = 0, error = 1, suggestion = 2, message = 3 */ - category: 0 | 1 | 2 | 3; - code: number; - /** TypeScriptWorker removes all but the `fileName` property to avoid serializing circular JSON structures. */ - file: - | { - fileName: string; - } - | undefined; - start: number | undefined; - length: number | undefined; - messageText: string | DiagnosticMessageChain; - } - interface EmitOutput { - outputFiles: OutputFile[]; - emitSkipped: boolean; - } - interface OutputFile { - name: string; - writeByteOrderMark: boolean; - text: string; - } - export interface LanguageServiceDefaults { - /** - * Event fired when compiler options or diagnostics options are changed. - */ - readonly onDidChange: IEvent; - /** - * Event fired when extra libraries registered with the language service change. - */ - readonly onDidExtraLibsChange: IEvent; - readonly workerOptions: WorkerOptions; - readonly inlayHintsOptions: InlayHintsOptions; - /** - * Get the current extra libs registered with the language service. - */ - getExtraLibs(): IExtraLibs; - /** - * Add an additional source file to the language service. Use this - * for typescript (definition) files that won't be loaded as editor - * documents, like `jquery.d.ts`. - * - * @param content The file content - * @param filePath An optional file path - * @returns A disposable which will remove the file from the - * language service upon disposal. - */ - addExtraLib(content: string, filePath?: string): IDisposable; - /** - * Remove all existing extra libs and set the additional source - * files to the language service. Use this for typescript definition - * files that won't be loaded as editor documents, like `jquery.d.ts`. - * @param libs An array of entries to register. - */ - setExtraLibs( - libs: { - content: string; - filePath?: string; - }[] - ): void; - /** - * Get current TypeScript compiler options for the language service. - */ - getCompilerOptions(): CompilerOptions; - /** - * Set TypeScript compiler options. - */ - setCompilerOptions(options: CompilerOptions): void; - /** - * Get the current diagnostics options for the language service. - */ - getDiagnosticsOptions(): DiagnosticsOptions; - /** - * Configure whether syntactic and/or semantic validation should - * be performed - */ - setDiagnosticsOptions(options: DiagnosticsOptions): void; - /** - * Configure webworker options - */ - setWorkerOptions(options: WorkerOptions): void; - /** - * No-op. - */ - setMaximumWorkerIdleTime(value: number): void; - /** - * Configure if all existing models should be eagerly sync'd - * to the worker on start or restart. - */ - setEagerModelSync(value: boolean): void; - /** - * Get the current setting for whether all existing models should be eagerly sync'd - * to the worker on start or restart. - */ - getEagerModelSync(): boolean; - /** - * Configure inlay hints options. - */ - setInlayHintsOptions(options: InlayHintsOptions): void; - } - export interface TypeScriptWorker { - /** - * Get diagnostic messages for any syntax issues in the given file. - */ - getSyntacticDiagnostics(fileName: string): Promise; - /** - * Get diagnostic messages for any semantic issues in the given file. - */ - getSemanticDiagnostics(fileName: string): Promise; - /** - * Get diagnostic messages for any suggestions related to the given file. - */ - getSuggestionDiagnostics(fileName: string): Promise; - /** - * Get the content of a given file. - */ - getScriptText(fileName: string): Promise; - /** - * Get diagnostic messages related to the current compiler options. - * @param fileName Not used - */ - getCompilerOptionsDiagnostics(fileName: string): Promise; - /** - * Get code completions for the given file and position. - * @returns `Promise` - */ - getCompletionsAtPosition(fileName: string, position: number): Promise; - /** - * Get code completion details for the given file, position, and entry. - * @returns `Promise` - */ - getCompletionEntryDetails( - fileName: string, - position: number, - entry: string - ): Promise; - /** - * Get signature help items for the item at the given file and position. - * @returns `Promise` - */ - getSignatureHelpItems( - fileName: string, - position: number, - options: any - ): Promise; - /** - * Get quick info for the item at the given position in the file. - * @returns `Promise` - */ - getQuickInfoAtPosition(fileName: string, position: number): Promise; - /** - * Get other ranges which are related to the item at the given position in the file (often used for highlighting). - * @returns `Promise | undefined>` - */ - getOccurrencesAtPosition( - fileName: string, - position: number - ): Promise | undefined>; - /** - * Get the definition of the item at the given position in the file. - * @returns `Promise | undefined>` - */ - getDefinitionAtPosition( - fileName: string, - position: number - ): Promise | undefined>; - /** - * Get references to the item at the given position in the file. - * @returns `Promise` - */ - getReferencesAtPosition(fileName: string, position: number): Promise; - /** - * Get outline entries for the item at the given position in the file. - * @returns `Promise` - */ - getNavigationBarItems(fileName: string): Promise; - /** - * Get changes which should be applied to format the given file. - * @param options `typescript.FormatCodeOptions` - * @returns `Promise` - */ - getFormattingEditsForDocument(fileName: string, options: any): Promise; - /** - * Get changes which should be applied to format the given range in the file. - * @param options `typescript.FormatCodeOptions` - * @returns `Promise` - */ - getFormattingEditsForRange( - fileName: string, - start: number, - end: number, - options: any - ): Promise; - /** - * Get formatting changes which should be applied after the given keystroke. - * @param options `typescript.FormatCodeOptions` - * @returns `Promise` - */ - getFormattingEditsAfterKeystroke( - fileName: string, - postion: number, - ch: string, - options: any - ): Promise; - /** - * Get other occurrences which should be updated when renaming the item at the given file and position. - * @returns `Promise` - */ - findRenameLocations( - fileName: string, - positon: number, - findInStrings: boolean, - findInComments: boolean, - providePrefixAndSuffixTextForRename: boolean - ): Promise; - /** - * Get edits which should be applied to rename the item at the given file and position (or a failure reason). - * @param options `typescript.RenameInfoOptions` - * @returns `Promise` - */ - getRenameInfo(fileName: string, positon: number, options: any): Promise; - /** - * Get transpiled output for the given file. - * @returns `typescript.EmitOutput` - */ - getEmitOutput(fileName: string): Promise; - /** - * Get possible code fixes at the given position in the file. - * @param formatOptions `typescript.FormatCodeOptions` - * @returns `Promise>` - */ - getCodeFixesAtPosition( - fileName: string, - start: number, - end: number, - errorCodes: number[], - formatOptions: any - ): Promise>; - /** - * Get inlay hints in the range of the file. - * @param fileName - * @returns `Promise` - */ - provideInlayHints(fileName: string, start: number, end: number): Promise>; - } - export const typescriptVersion: string; - export const typescriptDefaults: LanguageServiceDefaults; - export const javascriptDefaults: LanguageServiceDefaults; - export const getTypeScriptWorker: () => Promise<(...uris: Uri[]) => Promise>; - export const getJavaScriptWorker: () => Promise<(...uris: Uri[]) => Promise>; -} diff --git a/monaco-typescript/src/fillers/monaco-editor-core.ts b/monaco-typescript/src/fillers/monaco-editor-core.ts deleted file mode 100644 index cd996aa7..00000000 --- a/monaco-typescript/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-typescript/src/tsconfig.json b/monaco-typescript/src/tsconfig.json deleted file mode 100644 index 001f587e..00000000 --- a/monaco-typescript/src/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "compilerOptions": { - "module": "amd", - "moduleResolution": "node", - "outDir": "../out/amd", - "declaration": true, - "target": "es5", - "lib": ["dom", "es5", "es2015.collection", "es2015.iterable", "es2015.promise"], - "strict": true - } -} diff --git a/package.json b/package.json index 5f1b5038..c847d45f 100644 --- a/package.json +++ b/package.json @@ -10,12 +10,10 @@ "import-typescript": "node ./monaco-typescript/importTypescript", "watch-src": "tsc -w -p ./src", "watch-languages": "tsc -w -p ./monaco-languages/src", - "watch-typescript": "tsc -w -p ./monaco-typescript/src", - "watch": "npm-run-all -lp watch-src watch-languages watch-typescript", + "watch": "npm-run-all -lp watch-src watch-languages", "release-src": "node ./build/build", "release-languages": "node ./monaco-languages/build", - "release-typescript": "node ./monaco-typescript/build", - "release-plugins": "npm-run-all -lp release-src release-languages release-typescript", + "release-plugins": "npm-run-all -lp release-src release-languages", "test": "node ./monaco-languages/test/all.js", "gulp-release": "gulp release", "release": "npm-run-all -ls release-plugins gulp-release", diff --git a/monaco-typescript/src/languageFeatures.ts b/src/typescript/languageFeatures.ts similarity index 99% rename from monaco-typescript/src/languageFeatures.ts rename to src/typescript/languageFeatures.ts index 2dba4a86..cac3e8ee 100644 --- a/monaco-typescript/src/languageFeatures.ts +++ b/src/typescript/languageFeatures.ts @@ -24,7 +24,7 @@ import { IRange, MarkerTag, MarkerSeverity -} from './fillers/monaco-editor-core'; +} from '../fillers/monaco-editor-core'; //#region utils copied from typescript to prevent loading the entire typescriptServices --- diff --git a/monaco-typescript/src/lib/editor.worker.d.ts b/src/typescript/lib/editor.worker.d.ts similarity index 100% rename from monaco-typescript/src/lib/editor.worker.d.ts rename to src/typescript/lib/editor.worker.d.ts diff --git a/monaco-typescript/src/lib/lib.index.ts b/src/typescript/lib/lib.index.ts similarity index 100% rename from monaco-typescript/src/lib/lib.index.ts rename to src/typescript/lib/lib.index.ts diff --git a/monaco-typescript/src/lib/lib.ts b/src/typescript/lib/lib.ts similarity index 100% rename from monaco-typescript/src/lib/lib.ts rename to src/typescript/lib/lib.ts diff --git a/monaco-typescript/src/lib/typescriptServices-amd.js b/src/typescript/lib/typescriptServices-amd.js similarity index 100% rename from monaco-typescript/src/lib/typescriptServices-amd.js rename to src/typescript/lib/typescriptServices-amd.js diff --git a/monaco-typescript/src/lib/typescriptServices.d.ts b/src/typescript/lib/typescriptServices.d.ts similarity index 100% rename from monaco-typescript/src/lib/typescriptServices.d.ts rename to src/typescript/lib/typescriptServices.d.ts diff --git a/monaco-typescript/src/lib/typescriptServices.js b/src/typescript/lib/typescriptServices.js similarity index 100% rename from monaco-typescript/src/lib/typescriptServices.js rename to src/typescript/lib/typescriptServices.js diff --git a/monaco-typescript/src/lib/typescriptServicesMetadata.ts b/src/typescript/lib/typescriptServicesMetadata.ts similarity index 100% rename from monaco-typescript/src/lib/typescriptServicesMetadata.ts rename to src/typescript/lib/typescriptServicesMetadata.ts diff --git a/monaco-typescript/src/monaco.contribution.ts b/src/typescript/monaco.contribution.ts similarity index 99% rename from monaco-typescript/src/monaco.contribution.ts rename to src/typescript/monaco.contribution.ts index 0334106e..b00258a1 100644 --- a/monaco-typescript/src/monaco.contribution.ts +++ b/src/typescript/monaco.contribution.ts @@ -6,7 +6,7 @@ import type * as mode from './tsMode'; import { typescriptVersion as tsversion } from './lib/typescriptServicesMetadata'; // do not import the whole typescriptServices here -import { languages, Emitter, IEvent, IDisposable, Uri } from './fillers/monaco-editor-core'; +import { languages, Emitter, IEvent, IDisposable, Uri } from '../fillers/monaco-editor-core'; //#region enums copied from typescript to prevent loading the entire typescriptServices --- diff --git a/monaco-typescript/src/ts.worker.ts b/src/typescript/ts.worker.ts similarity index 92% rename from monaco-typescript/src/ts.worker.ts rename to src/typescript/ts.worker.ts index 3da5d69f..33b186a0 100644 --- a/monaco-typescript/src/ts.worker.ts +++ b/src/typescript/ts.worker.ts @@ -6,7 +6,7 @@ import * as edworker from 'monaco-editor-core/esm/vs/editor/editor.worker'; import { TypeScriptWorker, ICreateData } from './tsWorker'; -import { worker } from './fillers/monaco-editor-core'; +import { worker } from '../fillers/monaco-editor-core'; self.onmessage = () => { // ignore the first message diff --git a/monaco-typescript/src/tsMode.ts b/src/typescript/tsMode.ts similarity index 98% rename from monaco-typescript/src/tsMode.ts rename to src/typescript/tsMode.ts index 9ebf59cf..b1bdbdc2 100644 --- a/monaco-typescript/src/tsMode.ts +++ b/src/typescript/tsMode.ts @@ -8,7 +8,7 @@ import { WorkerManager } from './workerManager'; import type { TypeScriptWorker } from './tsWorker'; import { LanguageServiceDefaults } from './monaco.contribution'; import * as languageFeatures from './languageFeatures'; -import { languages, Uri } from './fillers/monaco-editor-core'; +import { languages, Uri } from '../fillers/monaco-editor-core'; let javaScriptWorker: (...uris: Uri[]) => Promise; let typeScriptWorker: (...uris: Uri[]) => Promise; diff --git a/monaco-typescript/src/tsWorker.ts b/src/typescript/tsWorker.ts similarity index 99% rename from monaco-typescript/src/tsWorker.ts rename to src/typescript/tsWorker.ts index a0fec667..3cf342a6 100644 --- a/monaco-typescript/src/tsWorker.ts +++ b/src/typescript/tsWorker.ts @@ -12,7 +12,7 @@ import { IExtraLibs, TypeScriptWorker as ITypeScriptWorker } from './monaco.contribution'; -import { Uri, worker } from './fillers/monaco-editor-core'; +import { Uri, worker } from '../fillers/monaco-editor-core'; /** * Loading a default lib as a source file will mess up TS completely. diff --git a/monaco-typescript/src/workerManager.ts b/src/typescript/workerManager.ts similarity index 97% rename from monaco-typescript/src/workerManager.ts rename to src/typescript/workerManager.ts index 6e70ae02..d7f18924 100644 --- a/monaco-typescript/src/workerManager.ts +++ b/src/typescript/workerManager.ts @@ -6,7 +6,7 @@ import { LanguageServiceDefaults } from './monaco.contribution'; import type { TypeScriptWorker } from './tsWorker'; -import { editor, Uri, IDisposable } from './fillers/monaco-editor-core'; +import { editor, Uri, IDisposable } from '../fillers/monaco-editor-core'; export class WorkerManager { private _modeId: string; From d5e3af3744599b65b9ff62699fbeb7d3519b5b8c Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Sat, 13 Nov 2021 20:15:46 +0100 Subject: [PATCH 06/10] Move out remaining files from `monaco-typescript` --- .../importTypescript.js | 4 +-- monaco-editor.code-workspace | 13 +++++++ monaco-editor/monaco-editor.code-workspace | 34 ------------------- monaco-editor/test/index.js | 3 +- .../test/typescript}/custom-worker.html | 0 .../test/typescript}/custom-worker.js | 0 .../test/typescript}/index.html | 0 .../test/typescript}/inlayHints.html | 0 package.json | 2 +- 9 files changed, 17 insertions(+), 39 deletions(-) rename {monaco-typescript => build}/importTypescript.js (97%) create mode 100644 monaco-editor.code-workspace delete mode 100644 monaco-editor/monaco-editor.code-workspace rename {monaco-typescript/test => monaco-editor/test/typescript}/custom-worker.html (100%) rename {monaco-typescript/test => monaco-editor/test/typescript}/custom-worker.js (100%) rename {monaco-typescript/test => monaco-editor/test/typescript}/index.html (100%) rename {monaco-typescript/test => monaco-editor/test/typescript}/inlayHints.html (100%) diff --git a/monaco-typescript/importTypescript.js b/build/importTypescript.js similarity index 97% rename from monaco-typescript/importTypescript.js rename to build/importTypescript.js index 039007c4..3dcb3551 100644 --- a/monaco-typescript/importTypescript.js +++ b/build/importTypescript.js @@ -14,7 +14,7 @@ const generatedNote = `// const REPO_ROOT = path.join(__dirname, '../'); const TYPESCRIPT_LIB_SOURCE = path.join(REPO_ROOT, 'node_modules/typescript/lib'); -const TYPESCRIPT_LIB_DESTINATION = path.join(REPO_ROOT, 'monaco-typescript/src/lib'); +const TYPESCRIPT_LIB_DESTINATION = path.join(REPO_ROOT, 'src/typescript/lib'); (function () { try { @@ -111,7 +111,7 @@ define("vs/language/typescript/lib/typescriptServices", [], function() { return // Remove pattern that creates warnings with esbuild // e.g. - // > monaco-typescript/src/lib/typescriptServices.js:20:21: warning: Top-level "this" will be replaced with undefined since this file is an ECMAScript module + // > /src/typescript/lib/typescriptServices.js:20:21: warning: Top-level "this" will be replaced with undefined since this file is an ECMAScript module // 20 │ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { // ╵ ~~~~ // diff --git a/monaco-editor.code-workspace b/monaco-editor.code-workspace new file mode 100644 index 00000000..18ac4963 --- /dev/null +++ b/monaco-editor.code-workspace @@ -0,0 +1,13 @@ +{ + "folders": [ + { + "path": "../vscode" + }, + { + "path": "../vscode-loc" + }, + { + "path": "." + } + ] +} diff --git a/monaco-editor/monaco-editor.code-workspace b/monaco-editor/monaco-editor.code-workspace deleted file mode 100644 index 91d7cc91..00000000 --- a/monaco-editor/monaco-editor.code-workspace +++ /dev/null @@ -1,34 +0,0 @@ -{ - "folders": [ - { - "path": "../vscode" - }, - { - "path": "../vscode-loc" - }, - { - "path": "." - }, - { - "path": "../monaco-css" - }, - { - "path": "../monaco-html" - }, - { - "path": "../monaco-json" - }, - { - "path": "../monaco-languages" - }, - { - "path": "../monaco-typescript" - }, - { - "path": "../monaco-editor-webpack-plugin" - }, - { - "path": "../monaco-editor-samples" - }, - ] -} diff --git a/monaco-editor/test/index.js b/monaco-editor/test/index.js index 5471603a..f965b7e5 100644 --- a/monaco-editor/test/index.js +++ b/monaco-editor/test/index.js @@ -1,5 +1,4 @@ -/// -/// +/// define(['require', './samples'], function (require, SAMPLES) { var domutils = require('vs/base/browser/dom'); diff --git a/monaco-typescript/test/custom-worker.html b/monaco-editor/test/typescript/custom-worker.html similarity index 100% rename from monaco-typescript/test/custom-worker.html rename to monaco-editor/test/typescript/custom-worker.html diff --git a/monaco-typescript/test/custom-worker.js b/monaco-editor/test/typescript/custom-worker.js similarity index 100% rename from monaco-typescript/test/custom-worker.js rename to monaco-editor/test/typescript/custom-worker.js diff --git a/monaco-typescript/test/index.html b/monaco-editor/test/typescript/index.html similarity index 100% rename from monaco-typescript/test/index.html rename to monaco-editor/test/typescript/index.html diff --git a/monaco-typescript/test/inlayHints.html b/monaco-editor/test/typescript/inlayHints.html similarity index 100% rename from monaco-typescript/test/inlayHints.html rename to monaco-editor/test/typescript/inlayHints.html diff --git a/package.json b/package.json index c847d45f..d3ed627a 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "license": "MIT", "scripts": { "simpleserver": "gulp simpleserver", - "import-typescript": "node ./monaco-typescript/importTypescript", + "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", From 0f7286cf55fe311dd42d4d31eef07cda1d8e32f8 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Sat, 13 Nov 2021 20:29:32 +0100 Subject: [PATCH 07/10] Move basic languages sources to `/src/` --- .prettierignore | 2 - CONTRIBUTING.md | 8 +-- build/build.js | 49 ++++++++++++++++ monaco-editor/metadata.js | 8 +-- monaco-editor/website/monarch.html | 4 +- monaco-languages/.github/workflows/ci.yml | 25 -------- monaco-languages/build.js | 58 ------------------- .../src/fillers/monaco-editor-core.ts | 6 -- monaco-languages/src/mocha.d.ts | 13 ----- monaco-languages/src/tsconfig.json | 10 ---- package.json | 8 +-- .../basic-languages}/_.contribution.ts | 2 +- .../abap/abap.contribution.ts | 0 .../basic-languages}/abap/abap.test.ts | 0 .../src => src/basic-languages}/abap/abap.ts | 5 +- .../apex/apex.contribution.ts | 0 .../basic-languages}/apex/apex.test.ts | 0 .../src => src/basic-languages}/apex/apex.ts | 2 +- .../azcli/azcli.contribution.ts | 0 .../basic-languages}/azcli/azcli.test.ts | 0 .../basic-languages}/azcli/azcli.ts | 2 +- .../basic-languages}/bat/bat.contribution.ts | 0 .../basic-languages}/bat/bat.test.ts | 0 .../src => src/basic-languages}/bat/bat.ts | 2 +- .../bicep/bicep.contribution.ts | 0 .../basic-languages}/bicep/bicep.test.ts | 0 .../basic-languages}/bicep/bicep.ts | 2 +- .../cameligo/cameligo.contribution.ts | 0 .../cameligo/cameligo.test.ts | 0 .../basic-languages}/cameligo/cameligo.ts | 2 +- .../clojure/clojure.contribution.ts | 0 .../basic-languages}/clojure/clojure.test.ts | 0 .../basic-languages}/clojure/clojure.ts | 2 +- .../coffee/coffee.contribution.ts | 0 .../basic-languages}/coffee/coffee.test.ts | 0 .../basic-languages}/coffee/coffee.ts | 2 +- .../basic-languages}/cpp/cpp.contribution.ts | 0 .../basic-languages}/cpp/cpp.test.ts | 0 .../src => src/basic-languages}/cpp/cpp.ts | 2 +- .../csharp/csharp.contribution.ts | 0 .../basic-languages}/csharp/csharp.test.ts | 0 .../basic-languages}/csharp/csharp.ts | 2 +- .../basic-languages}/csp/csp.contribution.ts | 0 .../basic-languages}/csp/csp.test.ts | 0 .../src => src/basic-languages}/csp/csp.ts | 2 +- .../basic-languages}/css/css.contribution.ts | 0 .../basic-languages}/css/css.test.ts | 0 .../src => src/basic-languages}/css/css.ts | 2 +- .../dart/dart.contribution.ts | 0 .../basic-languages}/dart/dart.test.ts | 0 .../src => src/basic-languages}/dart/dart.ts | 2 +- .../dockerfile/dockerfile.contribution.ts | 0 .../dockerfile/dockerfile.test.ts | 0 .../basic-languages}/dockerfile/dockerfile.ts | 2 +- .../basic-languages}/ecl/ecl.contribution.ts | 0 .../basic-languages}/ecl/ecl.test.ts | 0 .../src => src/basic-languages}/ecl/ecl.ts | 2 +- .../elixir/elixir.contribution.ts | 0 .../basic-languages}/elixir/elixir.test.ts | 0 .../basic-languages}/elixir/elixir.ts | 2 +- .../flow9/flow9.contribution.ts | 0 .../basic-languages}/flow9/flow9.test.ts | 0 .../basic-languages}/flow9/flow9.ts | 2 +- .../fsharp/fsharp.contribution.ts | 0 .../basic-languages}/fsharp/fsharp.test.ts | 0 .../basic-languages}/fsharp/fsharp.ts | 2 +- .../basic-languages}/go/go.contribution.ts | 0 .../src => src/basic-languages}/go/go.test.ts | 0 .../src => src/basic-languages}/go/go.ts | 2 +- .../graphql/graphql.contribution.ts | 0 .../basic-languages}/graphql/graphql.test.ts | 0 .../basic-languages}/graphql/graphql.ts | 2 +- .../handlebars/handlebars.contribution.ts | 0 .../handlebars/handlebars.test.ts | 0 .../basic-languages}/handlebars/handlebars.ts | 2 +- .../basic-languages}/hcl/hcl.contribution.ts | 0 .../basic-languages}/hcl/hcl.test.ts | 0 .../src => src/basic-languages}/hcl/hcl.ts | 2 +- .../html/html.contribution.ts | 0 .../basic-languages}/html/html.test.ts | 0 .../src => src/basic-languages}/html/html.ts | 2 +- .../basic-languages}/ini/ini.contribution.ts | 0 .../src => src/basic-languages}/ini/ini.ts | 2 +- .../java/java.contribution.ts | 0 .../basic-languages}/java/java.test.ts | 0 .../src => src/basic-languages}/java/java.ts | 2 +- .../javascript/javascript.contribution.ts | 0 .../javascript/javascript.test.ts | 0 .../basic-languages}/javascript/javascript.ts | 2 +- .../julia/julia.contribution.ts | 0 .../basic-languages}/julia/julia.test.ts | 0 .../basic-languages}/julia/julia.ts | 2 +- .../kotlin/kotlin.contribution.ts | 0 .../basic-languages}/kotlin/kotlin.test.ts | 0 .../basic-languages}/kotlin/kotlin.ts | 2 +- .../less/less.contribution.ts | 0 .../basic-languages}/less/less.test.ts | 0 .../src => src/basic-languages}/less/less.ts | 2 +- .../lexon/lexon.contribution.ts | 0 .../basic-languages}/lexon/lexon.test.ts | 0 .../basic-languages}/lexon/lexon.ts | 2 +- .../liquid/liquid.contribution.ts | 0 .../basic-languages}/liquid/liquid.test.ts | 0 .../basic-languages}/liquid/liquid.ts | 2 +- .../basic-languages}/lua/lua.contribution.ts | 0 .../basic-languages}/lua/lua.test.ts | 0 .../src => src/basic-languages}/lua/lua.ts | 2 +- .../basic-languages}/m3/m3.contribution.ts | 0 .../src => src/basic-languages}/m3/m3.test.ts | 0 .../src => src/basic-languages}/m3/m3.ts | 2 +- .../markdown/markdown.contribution.ts | 0 .../markdown/markdown.test.ts | 0 .../basic-languages}/markdown/markdown.ts | 2 +- .../mips/mips.contribution.ts | 0 .../basic-languages}/mips/mips.test.ts | 0 .../src => src/basic-languages}/mips/mips.ts | 2 +- .../basic-languages}/monaco.contribution.ts | 0 .../msdax/msdax.contribution.ts | 0 .../basic-languages}/msdax/msdax.test.ts | 0 .../basic-languages}/msdax/msdax.ts | 2 +- .../basic-languages}/mysql/keywords.js | 0 .../basic-languages}/mysql/keywords.mysql.txt | 0 .../mysql/mysql.contribution.ts | 0 .../basic-languages}/mysql/mysql.test.ts | 0 .../basic-languages}/mysql/mysql.ts | 2 +- .../objective-c/objective-c.contribution.ts | 0 .../objective-c/objective-c.test.ts | 0 .../objective-c/objective-c.ts | 2 +- .../pascal/pascal.contribution.ts | 0 .../basic-languages}/pascal/pascal.test.ts | 0 .../basic-languages}/pascal/pascal.ts | 2 +- .../pascaligo/pascaligo.contribution.ts | 0 .../pascaligo/pascaligo.test.ts | 0 .../basic-languages}/pascaligo/pascaligo.ts | 2 +- .../perl/perl.contribution.ts | 0 .../basic-languages}/perl/perl.test.ts | 0 .../src => src/basic-languages}/perl/perl.ts | 2 +- .../basic-languages}/pgsql/keywords.js | 0 .../pgsql/keywords.postgresql.txt | 0 .../pgsql/pgsql.contribution.ts | 0 .../basic-languages}/pgsql/pgsql.test.ts | 0 .../basic-languages}/pgsql/pgsql.ts | 2 +- .../basic-languages}/php/php.contribution.ts | 0 .../basic-languages}/php/php.test.ts | 0 .../src => src/basic-languages}/php/php.ts | 2 +- .../basic-languages}/pla/pla.contribution.ts | 0 .../basic-languages}/pla/pla.test.ts | 0 .../src => src/basic-languages}/pla/pla.ts | 2 +- .../postiats/postiats.contribution.ts | 0 .../postiats/postiats.test.ts | 0 .../basic-languages}/postiats/postiats.ts | 2 +- .../powerquery/powerquery.contribution.ts | 0 .../powerquery/powerquery.test.ts | 0 .../basic-languages}/powerquery/powerquery.ts | 2 +- .../powershell/powershell.contribution.ts | 0 .../powershell/powershell.test.ts | 0 .../basic-languages}/powershell/powershell.ts | 2 +- .../protobuf/protobuf.contribution.ts | 0 .../protobuf/protobuf.test.ts | 0 .../basic-languages}/protobuf/protobuf.ts | 2 +- .../basic-languages}/pug/pug.contribution.ts | 0 .../basic-languages}/pug/pug.test.ts | 0 .../src => src/basic-languages}/pug/pug.ts | 2 +- .../python/python.contribution.ts | 0 .../basic-languages}/python/python.test.ts | 0 .../basic-languages}/python/python.ts | 2 +- .../qsharp/qsharp.contribution.ts | 0 .../basic-languages}/qsharp/qsharp.test.ts | 0 .../basic-languages}/qsharp/qsharp.ts | 2 +- .../basic-languages}/r/r.contribution.ts | 0 .../src => src/basic-languages}/r/r.test.ts | 0 .../src => src/basic-languages}/r/r.ts | 2 +- .../razor/razor.contribution.ts | 0 .../basic-languages}/razor/razor.test.ts | 0 .../basic-languages}/razor/razor.ts | 2 +- .../redis/redis.contribution.ts | 0 .../basic-languages}/redis/redis.test.ts | 0 .../basic-languages}/redis/redis.ts | 2 +- .../redshift/redshift.contribution.ts | 0 .../redshift/redshift.test.ts | 0 .../basic-languages}/redshift/redshift.ts | 2 +- .../restructuredtext.contribution.ts | 0 .../restructuredtext/restructuredtext.test.ts | 0 .../restructuredtext/restructuredtext.ts | 2 +- .../ruby/ruby.contribution.ts | 0 .../basic-languages}/ruby/ruby.test.ts | 0 .../src => src/basic-languages}/ruby/ruby.ts | 2 +- .../rust/rust.contribution.ts | 0 .../basic-languages}/rust/rust.test.ts | 0 .../src => src/basic-languages}/rust/rust.ts | 2 +- .../basic-languages}/sb/sb.contribution.ts | 0 .../src => src/basic-languages}/sb/sb.test.ts | 0 .../src => src/basic-languages}/sb/sb.ts | 2 +- .../scala/scala.contribution.ts | 0 .../basic-languages}/scala/scala.test.ts | 0 .../basic-languages}/scala/scala.ts | 2 +- .../scheme/scheme.contribution.ts | 0 .../basic-languages}/scheme/scheme.test.ts | 0 .../basic-languages}/scheme/scheme.ts | 2 +- .../scss/scss.contribution.ts | 0 .../basic-languages}/scss/scss.test.ts | 0 .../src => src/basic-languages}/scss/scss.ts | 2 +- .../shell/shell.contribution.ts | 0 .../basic-languages}/shell/shell.test.ts | 0 .../basic-languages}/shell/shell.ts | 2 +- .../solidity/solidity.contribution.ts | 0 .../solidity/solidity.test.ts | 0 .../basic-languages}/solidity/solidity.ts | 2 +- .../sophia/sophia.contribution.ts | 0 .../basic-languages}/sophia/sophia.test.ts | 0 .../basic-languages}/sophia/sophia.ts | 2 +- .../sparql/sparql.contribution.ts | 0 .../basic-languages}/sparql/sparql.test.ts | 0 .../basic-languages}/sparql/sparql.ts | 0 .../basic-languages}/sql/keywords.js | 0 .../basic-languages}/sql/sql.contribution.ts | 0 .../basic-languages}/sql/sql.test.ts | 0 .../src => src/basic-languages}/sql/sql.ts | 2 +- .../basic-languages}/st/st.contribution.ts | 0 .../src => src/basic-languages}/st/st.test.ts | 0 .../src => src/basic-languages}/st/st.ts | 2 +- .../swift/swift.contribution.ts | 0 .../basic-languages}/swift/swift.test.ts | 0 .../basic-languages}/swift/swift.ts | 2 +- .../systemverilog.contribution.ts | 0 .../systemverilog/systemverilog.test.ts | 0 .../systemverilog/systemverilog.ts | 2 +- .../basic-languages}/tcl/tcl.contribution.ts | 0 .../basic-languages}/tcl/tcl.test.ts | 0 .../src => src/basic-languages}/tcl/tcl.ts | 2 +- .../basic-languages}/test/testRunner.ts | 2 +- .../twig/twig.contribution.ts | 0 .../basic-languages}/twig/twig.test.ts | 0 .../src => src/basic-languages}/twig/twig.ts | 2 +- .../typescript/typescript.contribution.ts | 0 .../typescript/typescript.test.ts | 0 .../basic-languages}/typescript/typescript.ts | 2 +- .../basic-languages}/vb/vb.contribution.ts | 0 .../src => src/basic-languages}/vb/vb.test.ts | 0 .../src => src/basic-languages}/vb/vb.ts | 2 +- .../basic-languages}/xml/xml.contribution.ts | 0 .../basic-languages}/xml/xml.test.ts | 0 .../src => src/basic-languages}/xml/xml.ts | 2 +- .../yaml/yaml.contribution.ts | 0 .../basic-languages}/yaml/yaml.test.ts | 0 .../src => src/basic-languages}/yaml/yaml.ts | 2 +- .../fillers/monaco-editor-core-amd.ts | 0 247 files changed, 138 insertions(+), 210 deletions(-) delete mode 100644 monaco-languages/.github/workflows/ci.yml delete mode 100644 monaco-languages/build.js delete mode 100644 monaco-languages/src/fillers/monaco-editor-core.ts delete mode 100644 monaco-languages/src/mocha.d.ts delete mode 100644 monaco-languages/src/tsconfig.json rename {monaco-languages/src => src/basic-languages}/_.contribution.ts (97%) rename {monaco-languages/src => src/basic-languages}/abap/abap.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/abap/abap.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/abap/abap.ts (99%) rename {monaco-languages/src => src/basic-languages}/apex/apex.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/apex/apex.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/apex/apex.ts (98%) rename {monaco-languages/src => src/basic-languages}/azcli/azcli.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/azcli/azcli.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/azcli/azcli.ts (95%) rename {monaco-languages/src => src/basic-languages}/bat/bat.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/bat/bat.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/bat/bat.ts (97%) rename {monaco-languages/src => src/basic-languages}/bicep/bicep.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/bicep/bicep.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/bicep/bicep.ts (98%) rename {monaco-languages/src => src/basic-languages}/cameligo/cameligo.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/cameligo/cameligo.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/cameligo/cameligo.ts (98%) rename {monaco-languages/src => src/basic-languages}/clojure/clojure.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/clojure/clojure.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/clojure/clojure.ts (99%) rename {monaco-languages/src => src/basic-languages}/coffee/coffee.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/coffee/coffee.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/coffee/coffee.ts (98%) rename {monaco-languages/src => src/basic-languages}/cpp/cpp.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/cpp/cpp.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/cpp/cpp.ts (99%) rename {monaco-languages/src => src/basic-languages}/csharp/csharp.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/csharp/csharp.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/csharp/csharp.ts (98%) rename {monaco-languages/src => src/basic-languages}/csp/csp.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/csp/csp.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/csp/csp.ts (96%) rename {monaco-languages/src => src/basic-languages}/css/css.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/css/css.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/css/css.ts (98%) rename {monaco-languages/src => src/basic-languages}/dart/dart.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/dart/dart.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/dart/dart.ts (98%) rename {monaco-languages/src => src/basic-languages}/dockerfile/dockerfile.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/dockerfile/dockerfile.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/dockerfile/dockerfile.ts (97%) rename {monaco-languages/src => src/basic-languages}/ecl/ecl.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/ecl/ecl.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/ecl/ecl.ts (99%) rename {monaco-languages/src => src/basic-languages}/elixir/elixir.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/elixir/elixir.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/elixir/elixir.ts (99%) rename {monaco-languages/src => src/basic-languages}/flow9/flow9.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/flow9/flow9.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/flow9/flow9.ts (97%) rename {monaco-languages/src => src/basic-languages}/fsharp/fsharp.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/fsharp/fsharp.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/fsharp/fsharp.ts (98%) rename {monaco-languages/src => src/basic-languages}/go/go.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/go/go.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/go/go.ts (98%) rename {monaco-languages/src => src/basic-languages}/graphql/graphql.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/graphql/graphql.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/graphql/graphql.ts (98%) rename {monaco-languages/src => src/basic-languages}/handlebars/handlebars.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/handlebars/handlebars.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/handlebars/handlebars.ts (99%) rename {monaco-languages/src => src/basic-languages}/hcl/hcl.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/hcl/hcl.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/hcl/hcl.ts (98%) rename {monaco-languages/src => src/basic-languages}/html/html.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/html/html.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/html/html.ts (99%) rename {monaco-languages/src => src/basic-languages}/ini/ini.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/ini/ini.ts (96%) rename {monaco-languages/src => src/basic-languages}/java/java.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/java/java.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/java/java.ts (98%) rename {monaco-languages/src => src/basic-languages}/javascript/javascript.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/javascript/javascript.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/javascript/javascript.ts (95%) rename {monaco-languages/src => src/basic-languages}/julia/julia.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/julia/julia.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/julia/julia.ts (99%) rename {monaco-languages/src => src/basic-languages}/kotlin/kotlin.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/kotlin/kotlin.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/kotlin/kotlin.ts (98%) rename {monaco-languages/src => src/basic-languages}/less/less.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/less/less.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/less/less.ts (98%) rename {monaco-languages/src => src/basic-languages}/lexon/lexon.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/lexon/lexon.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/lexon/lexon.ts (98%) rename {monaco-languages/src => src/basic-languages}/liquid/liquid.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/liquid/liquid.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/liquid/liquid.ts (98%) rename {monaco-languages/src => src/basic-languages}/lua/lua.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/lua/lua.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/lua/lua.ts (98%) rename {monaco-languages/src => src/basic-languages}/m3/m3.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/m3/m3.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/m3/m3.ts (98%) rename {monaco-languages/src => src/basic-languages}/markdown/markdown.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/markdown/markdown.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/markdown/markdown.ts (98%) rename {monaco-languages/src => src/basic-languages}/mips/mips.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/mips/mips.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/mips/mips.ts (98%) rename {monaco-languages/src => src/basic-languages}/monaco.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/msdax/msdax.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/msdax/msdax.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/msdax/msdax.ts (98%) rename {monaco-languages/src => src/basic-languages}/mysql/keywords.js (100%) rename {monaco-languages/src => src/basic-languages}/mysql/keywords.mysql.txt (100%) rename {monaco-languages/src => src/basic-languages}/mysql/mysql.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/mysql/mysql.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/mysql/mysql.ts (99%) rename {monaco-languages/src => src/basic-languages}/objective-c/objective-c.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/objective-c/objective-c.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/objective-c/objective-c.ts (98%) rename {monaco-languages/src => src/basic-languages}/pascal/pascal.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/pascal/pascal.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/pascal/pascal.ts (98%) rename {monaco-languages/src => src/basic-languages}/pascaligo/pascaligo.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/pascaligo/pascaligo.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/pascaligo/pascaligo.ts (98%) rename {monaco-languages/src => src/basic-languages}/perl/perl.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/perl/perl.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/perl/perl.ts (99%) rename {monaco-languages/src => src/basic-languages}/pgsql/keywords.js (100%) rename {monaco-languages/src => src/basic-languages}/pgsql/keywords.postgresql.txt (100%) rename {monaco-languages/src => src/basic-languages}/pgsql/pgsql.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/pgsql/pgsql.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/pgsql/pgsql.ts (99%) rename {monaco-languages/src => src/basic-languages}/php/php.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/php/php.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/php/php.ts (99%) rename {monaco-languages/src => src/basic-languages}/pla/pla.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/pla/pla.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/pla/pla.ts (97%) rename {monaco-languages/src => src/basic-languages}/postiats/postiats.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/postiats/postiats.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/postiats/postiats.ts (99%) rename {monaco-languages/src => src/basic-languages}/powerquery/powerquery.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/powerquery/powerquery.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/powerquery/powerquery.ts (99%) rename {monaco-languages/src => src/basic-languages}/powershell/powershell.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/powershell/powershell.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/powershell/powershell.ts (98%) rename {monaco-languages/src => src/basic-languages}/protobuf/protobuf.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/protobuf/protobuf.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/protobuf/protobuf.ts (99%) rename {monaco-languages/src => src/basic-languages}/pug/pug.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/pug/pug.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/pug/pug.ts (99%) rename {monaco-languages/src => src/basic-languages}/python/python.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/python/python.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/python/python.ts (98%) rename {monaco-languages/src => src/basic-languages}/qsharp/qsharp.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/qsharp/qsharp.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/qsharp/qsharp.ts (98%) rename {monaco-languages/src => src/basic-languages}/r/r.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/r/r.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/r/r.ts (98%) rename {monaco-languages/src => src/basic-languages}/razor/razor.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/razor/razor.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/razor/razor.ts (99%) rename {monaco-languages/src => src/basic-languages}/redis/redis.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/redis/redis.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/redis/redis.ts (98%) rename {monaco-languages/src => src/basic-languages}/redshift/redshift.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/redshift/redshift.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/redshift/redshift.ts (99%) rename {monaco-languages/src => src/basic-languages}/restructuredtext/restructuredtext.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/restructuredtext/restructuredtext.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/restructuredtext/restructuredtext.ts (98%) rename {monaco-languages/src => src/basic-languages}/ruby/ruby.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/ruby/ruby.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/ruby/ruby.ts (99%) rename {monaco-languages/src => src/basic-languages}/rust/rust.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/rust/rust.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/rust/rust.ts (98%) rename {monaco-languages/src => src/basic-languages}/sb/sb.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/sb/sb.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/sb/sb.ts (97%) rename {monaco-languages/src => src/basic-languages}/scala/scala.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/scala/scala.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/scala/scala.ts (99%) rename {monaco-languages/src => src/basic-languages}/scheme/scheme.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/scheme/scheme.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/scheme/scheme.ts (97%) rename {monaco-languages/src => src/basic-languages}/scss/scss.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/scss/scss.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/scss/scss.ts (99%) rename {monaco-languages/src => src/basic-languages}/shell/shell.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/shell/shell.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/shell/shell.ts (98%) rename {monaco-languages/src => src/basic-languages}/solidity/solidity.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/solidity/solidity.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/solidity/solidity.ts (99%) rename {monaco-languages/src => src/basic-languages}/sophia/sophia.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/sophia/sophia.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/sophia/sophia.ts (98%) rename {monaco-languages/src => src/basic-languages}/sparql/sparql.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/sparql/sparql.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/sparql/sparql.ts (100%) rename {monaco-languages/src => src/basic-languages}/sql/keywords.js (100%) rename {monaco-languages/src => src/basic-languages}/sql/sql.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/sql/sql.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/sql/sql.ts (99%) rename {monaco-languages/src => src/basic-languages}/st/st.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/st/st.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/st/st.ts (99%) rename {monaco-languages/src => src/basic-languages}/swift/swift.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/swift/swift.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/swift/swift.ts (98%) rename {monaco-languages/src => src/basic-languages}/systemverilog/systemverilog.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/systemverilog/systemverilog.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/systemverilog/systemverilog.ts (99%) rename {monaco-languages/src => src/basic-languages}/tcl/tcl.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/tcl/tcl.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/tcl/tcl.ts (98%) rename {monaco-languages/src => src/basic-languages}/test/testRunner.ts (96%) rename {monaco-languages/src => src/basic-languages}/twig/twig.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/twig/twig.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/twig/twig.ts (99%) rename {monaco-languages/src => src/basic-languages}/typescript/typescript.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/typescript/typescript.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/typescript/typescript.ts (99%) rename {monaco-languages/src => src/basic-languages}/vb/vb.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/vb/vb.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/vb/vb.ts (99%) rename {monaco-languages/src => src/basic-languages}/xml/xml.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/xml/xml.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/xml/xml.ts (97%) rename {monaco-languages/src => src/basic-languages}/yaml/yaml.contribution.ts (100%) rename {monaco-languages/src => src/basic-languages}/yaml/yaml.test.ts (100%) rename {monaco-languages/src => src/basic-languages}/yaml/yaml.ts (98%) rename {monaco-languages/src => src}/fillers/monaco-editor-core-amd.ts (100%) 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 From 219b9b25eb6da8fe75c370ab0baa3969767b6364 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Sat, 13 Nov 2021 20:37:28 +0100 Subject: [PATCH 08/10] Restore basic-languages unit tests --- package.json | 2 +- {monaco-languages/test => test/unit}/all.js | 16 +++++++--------- {monaco-languages/test => test/unit}/setup.js | 0 3 files changed, 8 insertions(+), 10 deletions(-) rename {monaco-languages/test => test/unit}/all.js (65%) rename {monaco-languages/test => test/unit}/setup.js (100%) diff --git a/package.json b/package.json index 29b8de2c..288a3b42 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "import-typescript": "node ./build/importTypescript", "watch": "tsc -w -p ./src", "release-plugins": "node ./build/build", - "test": "node ./monaco-languages/test/all.js", + "test": "node ./test/unit/all.js", "gulp-release": "gulp release", "release": "npm-run-all -ls release-plugins gulp-release", "website": "gulp build-website && npm run typedoc && gulp prepare-website-branch", diff --git a/monaco-languages/test/all.js b/test/unit/all.js similarity index 65% rename from monaco-languages/test/all.js rename to test/unit/all.js index 828ae45f..68a9bbd1 100644 --- a/monaco-languages/test/all.js +++ b/test/unit/all.js @@ -4,13 +4,11 @@ const glob = require('glob'); const path = require('path'); requirejs.config({ - baseUrl: 'monaco-languages', + baseUrl: '', paths: { - 'vs/css': 'test/css.mock', - 'vs/nls': 'test/nls.mock', - 'vs/basic-languages/fillers/monaco-editor-core': 'out/amd/fillers/monaco-editor-core-amd', - 'vs/basic-languages': 'out/amd', - vs: '../node_modules/monaco-editor-core/dev/vs' + 'vs/fillers/monaco-editor-core': 'out/amd/fillers/monaco-editor-core-amd', + 'vs/basic-languages': 'out/amd/basic-languages', + vs: './node_modules/monaco-editor-core/dev/vs' }, nodeRequire: require }); @@ -35,15 +33,15 @@ global.window = { }; requirejs( - ['test/setup'], + ['test/unit/setup'], function () { - glob('out/amd/*/*.test.js', { cwd: path.dirname(__dirname) }, function (err, files) { + glob('out/amd/basic-languages/*/*.test.js', { cwd: path.join(__dirname, '../../') }, function (err, files) { if (err) { console.log(err); return; } requirejs( - files.map((f) => f.replace(/^out\/amd/, 'vs/basic-languages').replace(/\.js$/, '')), + files.map((f) => f.replace(/^out\/amd/, 'vs').replace(/\.js$/, '')), function () { // We can launch the tests! }, diff --git a/monaco-languages/test/setup.js b/test/unit/setup.js similarity index 100% rename from monaco-languages/test/setup.js rename to test/unit/setup.js From 7b371107bf9b2320f7a07f321bfc1c99aad5ae70 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Sat, 13 Nov 2021 20:38:47 +0100 Subject: [PATCH 09/10] Remove dev dep `npm-run-all` --- package-lock.json | 204 ---------------------------------------------- package.json | 3 +- 2 files changed, 1 insertion(+), 206 deletions(-) diff --git a/package-lock.json b/package-lock.json index e06d9930..5de3ff57 100644 --- a/package-lock.json +++ b/package-lock.json @@ -164,15 +164,6 @@ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, "ansi-wrap": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", @@ -606,17 +597,6 @@ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", "dev": true }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, "chokidar": { "version": "2.1.8", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", @@ -736,21 +716,6 @@ "object-visit": "^1.0.0" } }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, "color-support": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", @@ -841,19 +806,6 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, "cssesc": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", @@ -1431,12 +1383,6 @@ "dev": true, "optional": true }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, "escodegen": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", @@ -2092,12 +2038,6 @@ "call-bind": "^1.0.2" } }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, "has-symbols": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", @@ -2745,12 +2685,6 @@ } } }, - "json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", - "dev": true - }, "json-schema": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", @@ -2979,12 +2913,6 @@ } } }, - "memorystream": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", - "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=", - "dev": true - }, "micromatch": { "version": "3.1.10", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", @@ -3113,12 +3041,6 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, - "nice-try": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", - "dev": true - }, "normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -3146,79 +3068,6 @@ "once": "^1.3.2" } }, - "npm-run-all": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz", - "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "chalk": "^2.4.1", - "cross-spawn": "^6.0.5", - "memorystream": "^0.3.1", - "minimatch": "^3.0.4", - "pidtree": "^0.3.0", - "read-pkg": "^3.0.0", - "shell-quote": "^1.6.1", - "string.prototype.padend": "^3.0.0" - }, - "dependencies": { - "load-json-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" - } - }, - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true, - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - }, - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "dev": true, - "requires": { - "pify": "^3.0.0" - } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - }, - "read-pkg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", - "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", - "dev": true, - "requires": { - "load-json-file": "^4.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^3.0.0" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - } - } - }, "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", @@ -3475,12 +3324,6 @@ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true - }, "path-parse": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", @@ -3528,12 +3371,6 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "dev": true }, - "pidtree": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz", - "integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==", - "dev": true - }, "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", @@ -4006,27 +3843,6 @@ } } }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true - }, - "shell-quote": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz", - "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==", - "dev": true - }, "shiki": { "version": "0.9.12", "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.9.12.tgz", @@ -4336,17 +4152,6 @@ "strip-ansi": "^3.0.0" } }, - "string.prototype.padend": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.3.tgz", - "integrity": "sha512-jNIIeokznm8SD/TZISQsZKYu7RJyheFNt84DUPrh482GC8RVp2MKqm2O5oBRdGxbDQoXrhhWtPIWQOiy20svUg==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.1" - } - }, "string.prototype.trim": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.5.tgz", @@ -4405,15 +4210,6 @@ "is-utf8": "^0.2.0" } }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - }, "sver-compat": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz", diff --git a/package.json b/package.json index 288a3b42..e40f7b0a 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "release-plugins": "node ./build/build", "test": "node ./test/unit/all.js", "gulp-release": "gulp release", - "release": "npm-run-all -ls release-plugins gulp-release", + "release": "npm run release-plugins && npm run gulp-release", "website": "gulp build-website && npm run typedoc && gulp prepare-website-branch", "build-website": "gulp build-website && npm run typedoc", "typedoc": "cd monaco-editor/typedoc && \"../../node_modules/.bin/typedoc\" --options ./typedoc.json", @@ -38,7 +38,6 @@ "jsdom": "^17.0.0", "jsonc-parser": "^3.0.0", "monaco-editor-core": "0.30.1", - "npm-run-all": "^4.1.5", "prettier": "^2.4.1", "requirejs": "^2.3.6", "rimraf": "^3.0.2", From c3ac455fd2128d03eabeba6cf997b48d0fad5a1b Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Sat, 13 Nov 2021 20:41:24 +0100 Subject: [PATCH 10/10] Remove unused functions --- build/build.js | 40 ++++---- build/utils.js | 98 +------------------ ...or.code-workspace => editor.code-workspace | 0 3 files changed, 25 insertions(+), 113 deletions(-) rename monaco-editor.code-workspace => editor.code-workspace (100%) diff --git a/build/build.js b/build/build.js index 619bf425..b54194ce 100644 --- a/build/build.js +++ b/build/build.js @@ -6,7 +6,7 @@ //@ts-check const glob = require('glob'); -const { copyFile, removeDir, tsc, dts, buildESM2, buildAMD2 } = require('../build/utils'); +const { copyFile, removeDir, tsc, dts, buildESM, buildAMD } = require('../build/utils'); removeDir(`out`); @@ -35,23 +35,23 @@ dts( //#region css -buildESM2({ +buildESM({ base: 'css', entryPoints: ['src/css/monaco.contribution.ts', 'src/css/cssMode.ts', 'src/css/css.worker.ts'], external: ['monaco-editor-core', '*/cssMode'] }); -buildAMD2({ +buildAMD({ base: 'css', entryPoint: 'src/css/monaco.contribution.ts', amdModuleId: 'vs/language/css/monaco.contribution', amdDependencies: ['vs/editor/editor.api'] }); -buildAMD2({ +buildAMD({ base: 'css', entryPoint: 'src/css/cssMode.ts', amdModuleId: 'vs/language/css/cssMode' }); -buildAMD2({ +buildAMD({ base: 'css', entryPoint: 'src/css/cssWorker.ts', amdModuleId: 'vs/language/css/cssWorker' @@ -61,7 +61,7 @@ buildAMD2({ //#region html -buildESM2({ +buildESM({ base: 'html', entryPoints: [ 'src/html/monaco.contribution.ts', @@ -70,18 +70,18 @@ buildESM2({ ], external: ['monaco-editor-core', '*/htmlMode'] }); -buildAMD2({ +buildAMD({ base: 'html', entryPoint: 'src/html/monaco.contribution.ts', amdModuleId: 'vs/language/html/monaco.contribution', amdDependencies: ['vs/editor/editor.api'] }); -buildAMD2({ +buildAMD({ base: 'html', entryPoint: 'src/html/htmlMode.ts', amdModuleId: 'vs/language/html/htmlMode' }); -buildAMD2({ +buildAMD({ base: 'html', entryPoint: 'src/html/htmlWorker.ts', amdModuleId: 'vs/language/html/htmlWorker' @@ -91,7 +91,7 @@ buildAMD2({ //#region json -buildESM2({ +buildESM({ base: 'json', entryPoints: [ 'src/json/monaco.contribution.ts', @@ -100,18 +100,18 @@ buildESM2({ ], external: ['monaco-editor-core', '*/jsonMode'] }); -buildAMD2({ +buildAMD({ base: 'json', entryPoint: 'src/json/monaco.contribution.ts', amdModuleId: 'vs/language/json/monaco.contribution', amdDependencies: ['vs/editor/editor.api'] }); -buildAMD2({ +buildAMD({ base: 'json', entryPoint: 'src/json/jsonMode.ts', amdModuleId: 'vs/language/json/jsonMode' }); -buildAMD2({ +buildAMD({ base: 'json', entryPoint: 'src/json/jsonWorker.ts', amdModuleId: 'vs/language/json/jsonWorker' @@ -126,7 +126,7 @@ copyFile( `out/amd/typescript/lib/typescriptServices.js` ); -buildESM2({ +buildESM({ base: 'typescript', entryPoints: [ 'src/typescript/monaco.contribution.ts', @@ -135,18 +135,18 @@ buildESM2({ ], external: ['monaco-editor-core', '*/tsMode'] }); -buildAMD2({ +buildAMD({ base: 'typescript', entryPoint: 'src/typescript/monaco.contribution.ts', amdModuleId: 'vs/language/typescript/monaco.contribution', amdDependencies: ['vs/editor/editor.api'] }); -buildAMD2({ +buildAMD({ base: 'typescript', entryPoint: 'src/typescript/tsMode.ts', amdModuleId: 'vs/language/typescript/tsMode' }); -buildAMD2({ +buildAMD({ base: 'typescript', entryPoint: 'src/typescript/tsWorker.ts', amdModuleId: 'vs/language/typescript/tsWorker' @@ -175,7 +175,7 @@ glob('../src/basic-languages/*/*.contribution.ts', { cwd: __dirname }, function external.push(`*/${language}.contribution`); external.push(`*/${language}`); } - buildESM2({ + buildESM({ base: 'basic-languages', entryPoints, external @@ -184,14 +184,14 @@ glob('../src/basic-languages/*/*.contribution.ts', { cwd: __dirname }, function // AMD { - buildAMD2({ + buildAMD({ 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({ + buildAMD({ base: 'basic-languages', entryPoint: `src/basic-languages/${language}/${language}.ts`, amdModuleId: `vs/basic-languages/${language}/${language}` diff --git a/build/utils.js b/build/utils.js index 83290843..b6c3f1c3 100644 --- a/build/utils.js +++ b/build/utils.js @@ -185,37 +185,6 @@ exports.build = build; * }} options */ function buildESM(options) { - build({ - entryPoints: options.entryPoints.map((e) => `${options.base}/${e}`), - bundle: true, - target: 'esnext', - format: 'esm', - define: { - AMD: 'false' - }, - banner: { - js: bundledFileHeader - }, - external: options.external, - outbase: `${options.base}/src`, - outdir: `${options.base}/release/esm/`, - plugins: [ - alias({ - 'vscode-nls': path.join(__dirname, 'fillers/vscode-nls.ts') - }) - ] - }); -} -exports.buildESM = buildESM; - -/** - * @param {{ - * base: string; - * entryPoints: string[]; - * external: string[]; - * }} options - */ -function buildESM2(options) { build({ entryPoints: options.entryPoints, bundle: true, @@ -237,7 +206,7 @@ function buildESM2(options) { ] }); } -exports.buildESM2 = buildESM2; +exports.buildESM = buildESM; /** * @param {'dev'|'min'} type @@ -249,63 +218,6 @@ exports.buildESM2 = buildESM2; * }} options */ function buildOneAMD(type, options) { - /** @type {import('esbuild').BuildOptions} */ - const opts = { - entryPoints: [`${options.base}/${options.entryPoint}`], - bundle: true, - target: 'esnext', - format: 'iife', - define: { - AMD: 'true' - }, - globalName: 'moduleExports', - banner: { - js: `${bundledFileHeader}define("${options.amdModuleId}",[${(options.amdDependencies || []) - .map((dep) => `"${dep}"`) - .join(',')}],()=>{` - }, - footer: { - js: 'return moduleExports;\n});' - }, - outbase: `${options.base}/src`, - outdir: `${options.base}/release/${type}/`, - plugins: [ - alias({ - 'vscode-nls': path.join(__dirname, '../build/fillers/vscode-nls.ts'), - 'monaco-editor-core': path.join(__dirname, '../build/fillers/monaco-editor-core-amd.ts') - }) - ] - }; - if (type === 'min') { - opts.minify = true; - } - build(opts); -} - -/** - * @param {{ - * base: string; - * entryPoint: string; - * amdModuleId: string; - * amdDependencies?: string[]; - * }} options - */ -function buildAMD(options) { - buildOneAMD('dev', options); - buildOneAMD('min', options); -} -exports.buildAMD = buildAMD; - -/** - * @param {'dev'|'min'} type - * @param {{ - * base: string; - * entryPoint: string; - * amdModuleId: string; - * amdDependencies?: string[]; - * }} options - */ -function buildOneAMD2(type, options) { /** @type {import('esbuild').BuildOptions} */ const opts = { entryPoints: [options.entryPoint], @@ -347,11 +259,11 @@ function buildOneAMD2(type, options) { * amdDependencies?: string[]; * }} options */ -function buildAMD2(options) { - buildOneAMD2('dev', options); - buildOneAMD2('min', options); +function buildAMD(options) { + buildOneAMD('dev', options); + buildOneAMD('min', options); } -exports.buildAMD2 = buildAMD2; +exports.buildAMD = buildAMD; function getGitVersion() { const git = path.join(REPO_ROOT, '.git'); diff --git a/monaco-editor.code-workspace b/editor.code-workspace similarity index 100% rename from monaco-editor.code-workspace rename to editor.code-workspace