From 91edee579195dbc61ef05bd31e653be0aff50a1d Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Wed, 2 Feb 2022 17:12:13 +0100 Subject: [PATCH] Moves src/{typescript,css,...} to src/language/{typescript,css,...} to align with the released paths --- .prettierignore | 2 +- build/build.js | 102 ++++++++++-------- build/importTypescript.js | 2 +- metadata.js | 16 +-- .../common/lspLanguageFeatures.ts | 2 +- src/{ => language}/css/css.worker.ts | 0 src/{ => language}/css/cssMode.ts | 2 +- src/{ => language}/css/cssWorker.ts | 2 +- src/{ => language}/css/monaco.contribution.ts | 2 +- src/{ => language}/css/workerManager.ts | 2 +- src/{ => language}/html/html.worker.ts | 0 src/{ => language}/html/htmlMode.ts | 2 +- src/{ => language}/html/htmlWorker.ts | 2 +- .../html/monaco.contribution.ts | 2 +- src/{ => language}/html/workerManager.ts | 2 +- src/{ => language}/json/json.worker.ts | 0 src/{ => language}/json/jsonMode.ts | 2 +- src/{ => language}/json/jsonWorker.ts | 2 +- .../json/monaco.contribution.ts | 2 +- src/{ => language}/json/tokenization.ts | 2 +- src/{ => language}/json/workerManager.ts | 2 +- .../typescript/languageFeatures.ts | 2 +- .../typescript/lib/editor.worker.d.ts | 0 .../typescript/lib/lib.index.ts | 0 src/{ => language}/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/{ => language}/typescript/ts.worker.ts | 2 +- src/{ => language}/typescript/tsMode.ts | 2 +- src/{ => language}/typescript/tsWorker.ts | 2 +- .../typescript/workerManager.ts | 2 +- test/manual/dev-setup.js | 4 - 35 files changed, 85 insertions(+), 81 deletions(-) rename src/{ => language}/common/lspLanguageFeatures.ts (99%) rename src/{ => language}/css/css.worker.ts (100%) rename src/{ => language}/css/cssMode.ts (97%) rename src/{ => language}/css/cssWorker.ts (99%) rename src/{ => language}/css/monaco.contribution.ts (99%) rename src/{ => language}/css/workerManager.ts (97%) rename src/{ => language}/html/html.worker.ts (100%) rename src/{ => language}/html/htmlMode.ts (98%) rename src/{ => language}/html/htmlWorker.ts (98%) rename src/{ => language}/html/monaco.contribution.ts (99%) rename src/{ => language}/html/workerManager.ts (97%) rename src/{ => language}/json/json.worker.ts (100%) rename src/{ => language}/json/jsonMode.ts (98%) rename src/{ => language}/json/jsonWorker.ts (99%) rename src/{ => language}/json/monaco.contribution.ts (98%) rename src/{ => language}/json/tokenization.ts (99%) rename src/{ => language}/json/workerManager.ts (97%) rename src/{ => language}/typescript/languageFeatures.ts (99%) rename src/{ => language}/typescript/lib/editor.worker.d.ts (100%) rename src/{ => language}/typescript/lib/lib.index.ts (100%) rename src/{ => language}/typescript/lib/lib.ts (100%) rename src/{ => language}/typescript/lib/typescriptServices-amd.js (100%) rename src/{ => language}/typescript/lib/typescriptServices.d.ts (100%) rename src/{ => language}/typescript/lib/typescriptServices.js (100%) rename src/{ => language}/typescript/lib/typescriptServicesMetadata.ts (100%) rename src/{ => language}/typescript/monaco.contribution.ts (99%) rename src/{ => language}/typescript/ts.worker.ts (92%) rename src/{ => language}/typescript/tsMode.ts (97%) rename src/{ => language}/typescript/tsWorker.ts (99%) rename src/{ => language}/typescript/workerManager.ts (97%) diff --git a/.prettierignore b/.prettierignore index 827c698c..f5c0ba4b 100644 --- a/.prettierignore +++ b/.prettierignore @@ -9,7 +9,7 @@ /samples/browser-esm-webpack-small/dist/*.js /samples/browser-esm-webpack-typescript/dist/*.js /samples/browser-esm-webpack-typescript-react/dist/*.js -/src/typescript/lib/ +/src/language/typescript/lib/ /test/manual/generated/ /website/lib/ /website/typedoc/monaco.d.ts diff --git a/build/build.js b/build/build.js index 045e6a18..f663b727 100644 --- a/build/build.js +++ b/build/build.js @@ -15,20 +15,24 @@ 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`, - `out/release/html/monaco.d.ts`, + `out/amd/language/css/monaco.contribution.d.ts`, + `out/release/language/css/monaco.d.ts`, + 'monaco.languages.css' +); +dts( + `out/amd/language/html/monaco.contribution.d.ts`, + `out/release/language/html/monaco.d.ts`, 'monaco.languages.html' ); dts( - `out/amd/json/monaco.contribution.d.ts`, - `out/release/json/monaco.d.ts`, + `out/amd/language/json/monaco.contribution.d.ts`, + `out/release/language/json/monaco.d.ts`, 'monaco.languages.json' ); dts( - `out/amd/typescript/monaco.contribution.d.ts`, - `out/release/typescript/monaco.d.ts`, + `out/amd/language/typescript/monaco.contribution.d.ts`, + `out/release/language/typescript/monaco.d.ts`, 'monaco.languages.typescript' ); @@ -37,24 +41,28 @@ dts( //#region css buildESM({ - base: 'css', - entryPoints: ['src/css/monaco.contribution.ts', 'src/css/cssMode.ts', 'src/css/css.worker.ts'], + base: 'language/css', + entryPoints: [ + 'src/language/css/monaco.contribution.ts', + 'src/language/css/cssMode.ts', + 'src/language/css/css.worker.ts' + ], external: ['monaco-editor-core', '*/cssMode'] }); buildAMD({ - base: 'css', - entryPoint: 'src/css/monaco.contribution.ts', + base: 'language/css', + entryPoint: 'src/language/css/monaco.contribution.ts', amdModuleId: 'vs/language/css/monaco.contribution', amdDependencies: ['vs/editor/editor.api'] }); buildAMD({ - base: 'css', - entryPoint: 'src/css/cssMode.ts', + base: 'language/css', + entryPoint: 'src/language/css/cssMode.ts', amdModuleId: 'vs/language/css/cssMode' }); buildAMD({ - base: 'css', - entryPoint: 'src/css/cssWorker.ts', + base: 'language/css', + entryPoint: 'src/language/css/cssWorker.ts', amdModuleId: 'vs/language/css/cssWorker' }); @@ -63,28 +71,28 @@ buildAMD({ //#region html buildESM({ - base: 'html', + base: 'language/html', entryPoints: [ - 'src/html/monaco.contribution.ts', - 'src/html/htmlMode.ts', - 'src/html/html.worker.ts' + 'src/language/html/monaco.contribution.ts', + 'src/language/html/htmlMode.ts', + 'src/language/html/html.worker.ts' ], external: ['monaco-editor-core', '*/htmlMode'] }); buildAMD({ - base: 'html', - entryPoint: 'src/html/monaco.contribution.ts', + base: 'language/html', + entryPoint: 'src/language/html/monaco.contribution.ts', amdModuleId: 'vs/language/html/monaco.contribution', amdDependencies: ['vs/editor/editor.api'] }); buildAMD({ - base: 'html', - entryPoint: 'src/html/htmlMode.ts', + base: 'language/html', + entryPoint: 'src/language/html/htmlMode.ts', amdModuleId: 'vs/language/html/htmlMode' }); buildAMD({ - base: 'html', - entryPoint: 'src/html/htmlWorker.ts', + base: 'language/html', + entryPoint: 'src/language/html/htmlWorker.ts', amdModuleId: 'vs/language/html/htmlWorker' }); @@ -93,28 +101,28 @@ buildAMD({ //#region json buildESM({ - base: 'json', + base: 'language/json', entryPoints: [ - 'src/json/monaco.contribution.ts', - 'src/json/jsonMode.ts', - 'src/json/json.worker.ts' + 'src/language/json/monaco.contribution.ts', + 'src/language/json/jsonMode.ts', + 'src/language/json/json.worker.ts' ], external: ['monaco-editor-core', '*/jsonMode'] }); buildAMD({ - base: 'json', - entryPoint: 'src/json/monaco.contribution.ts', + base: 'language/json', + entryPoint: 'src/language/json/monaco.contribution.ts', amdModuleId: 'vs/language/json/monaco.contribution', amdDependencies: ['vs/editor/editor.api'] }); buildAMD({ - base: 'json', - entryPoint: 'src/json/jsonMode.ts', + base: 'language/json', + entryPoint: 'src/language/json/jsonMode.ts', amdModuleId: 'vs/language/json/jsonMode' }); buildAMD({ - base: 'json', - entryPoint: 'src/json/jsonWorker.ts', + base: 'language/json', + entryPoint: 'src/language/json/jsonWorker.ts', amdModuleId: 'vs/language/json/jsonWorker' }); @@ -123,33 +131,33 @@ buildAMD({ //#region typescript copyFile( - `src/typescript/lib/typescriptServices-amd.js`, - `out/amd/typescript/lib/typescriptServices.js` + `src/language/typescript/lib/typescriptServices-amd.js`, + `out/amd/language/typescript/lib/typescriptServices.js` ); buildESM({ - base: 'typescript', + base: 'language/typescript', entryPoints: [ - 'src/typescript/monaco.contribution.ts', - 'src/typescript/tsMode.ts', - 'src/typescript/ts.worker.ts' + 'src/language/typescript/monaco.contribution.ts', + 'src/language/typescript/tsMode.ts', + 'src/language/typescript/ts.worker.ts' ], external: ['monaco-editor-core', '*/tsMode'] }); buildAMD({ - base: 'typescript', - entryPoint: 'src/typescript/monaco.contribution.ts', + base: 'language/typescript', + entryPoint: 'src/language/typescript/monaco.contribution.ts', amdModuleId: 'vs/language/typescript/monaco.contribution', amdDependencies: ['vs/editor/editor.api'] }); buildAMD({ - base: 'typescript', - entryPoint: 'src/typescript/tsMode.ts', + base: 'language/typescript', + entryPoint: 'src/language/typescript/tsMode.ts', amdModuleId: 'vs/language/typescript/tsMode' }); buildAMD({ - base: 'typescript', - entryPoint: 'src/typescript/tsWorker.ts', + base: 'language/typescript', + entryPoint: 'src/language/typescript/tsWorker.ts', amdModuleId: 'vs/language/typescript/tsWorker' }); diff --git a/build/importTypescript.js b/build/importTypescript.js index a0c29efe..b514027d 100644 --- a/build/importTypescript.js +++ b/build/importTypescript.js @@ -16,7 +16,7 @@ const generatedNote = `// `; const TYPESCRIPT_LIB_SOURCE = path.join(REPO_ROOT, 'node_modules/typescript/lib'); -const TYPESCRIPT_LIB_DESTINATION = path.join(REPO_ROOT, 'src/typescript/lib'); +const TYPESCRIPT_LIB_DESTINATION = path.join(REPO_ROOT, 'src/language/typescript/lib'); (function () { try { diff --git a/metadata.js b/metadata.js index 6215731d..a3f906fb 100644 --- a/metadata.js +++ b/metadata.js @@ -15,10 +15,10 @@ name: 'monaco-typescript', contrib: 'vs/language/typescript/monaco.contribution', modulePrefix: 'vs/language/typescript', - rootPath: './out/release/typescript', + rootPath: './out/release/language/typescript', paths: { // use ./ to indicate it is relative to the `rootPath` - src: './../../amd/typescript', + src: './../../../amd/language/typescript', dev: './dev', min: './min', esm: './esm' @@ -28,10 +28,10 @@ name: 'monaco-css', contrib: 'vs/language/css/monaco.contribution', modulePrefix: 'vs/language/css', - rootPath: './out/release/css', + rootPath: './out/release/language/css', paths: { // use ./ to indicate it is relative to the `rootPath` - src: './../../amd/css', + src: './../../../amd/language/css', dev: './dev', min: './min', esm: './esm' @@ -41,10 +41,10 @@ name: 'monaco-json', contrib: 'vs/language/json/monaco.contribution', modulePrefix: 'vs/language/json', - rootPath: './out/release/json', + rootPath: './out/release/language/json', paths: { // use ./ to indicate it is relative to the `rootPath` - src: './../../amd/json', + src: './../../../amd/language/json', dev: './dev', min: './min', esm: './esm' @@ -54,10 +54,10 @@ name: 'monaco-html', contrib: 'vs/language/html/monaco.contribution', modulePrefix: 'vs/language/html', - rootPath: './out/release/html', + rootPath: './out/release/language/html', paths: { // use ./ to indicate it is relative to the `rootPath` - src: './../../amd/html', + src: './../../../amd/language/html', dev: './dev', min: './min', esm: './esm' diff --git a/src/common/lspLanguageFeatures.ts b/src/language/common/lspLanguageFeatures.ts similarity index 99% rename from src/common/lspLanguageFeatures.ts rename to src/language/common/lspLanguageFeatures.ts index db9a7425..9f88d6b3 100644 --- a/src/common/lspLanguageFeatures.ts +++ b/src/language/common/lspLanguageFeatures.ts @@ -16,7 +16,7 @@ import { IDisposable, MarkerSeverity, IEvent -} from '../fillers/monaco-editor-core'; +} from '../../fillers/monaco-editor-core'; export interface WorkerAccessor { (...more: Uri[]): Promise; diff --git a/src/css/css.worker.ts b/src/language/css/css.worker.ts similarity index 100% rename from src/css/css.worker.ts rename to src/language/css/css.worker.ts diff --git a/src/css/cssMode.ts b/src/language/css/cssMode.ts similarity index 97% rename from src/css/cssMode.ts rename to src/language/css/cssMode.ts index fd73f59f..d916cb02 100644 --- a/src/css/cssMode.ts +++ b/src/language/css/cssMode.ts @@ -7,7 +7,7 @@ import { WorkerManager } from './workerManager'; import type { CSSWorker } from './cssWorker'; import { LanguageServiceDefaults } from './monaco.contribution'; import * as languageFeatures from '../common/lspLanguageFeatures'; -import { Uri, IDisposable, languages } from '../fillers/monaco-editor-core'; +import { Uri, IDisposable, languages } from '../../fillers/monaco-editor-core'; export function setupMode(defaults: LanguageServiceDefaults): IDisposable { const disposables: IDisposable[] = []; diff --git a/src/css/cssWorker.ts b/src/language/css/cssWorker.ts similarity index 99% rename from src/css/cssWorker.ts rename to src/language/css/cssWorker.ts index ac50ba76..5650315e 100644 --- a/src/css/cssWorker.ts +++ b/src/language/css/cssWorker.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { worker } from '../fillers/monaco-editor-core'; +import type { worker } from '../../fillers/monaco-editor-core'; import * as cssService from 'vscode-css-languageservice'; import { Options } from './monaco.contribution'; diff --git a/src/css/monaco.contribution.ts b/src/language/css/monaco.contribution.ts similarity index 99% rename from src/css/monaco.contribution.ts rename to src/language/css/monaco.contribution.ts index 5b01210a..b3b5d114 100644 --- a/src/css/monaco.contribution.ts +++ b/src/language/css/monaco.contribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as mode from './cssMode'; -import { languages, Emitter, IEvent } from '../fillers/monaco-editor-core'; +import { languages, Emitter, IEvent } from '../../fillers/monaco-editor-core'; export interface Options { readonly validate?: boolean; diff --git a/src/css/workerManager.ts b/src/language/css/workerManager.ts similarity index 97% rename from src/css/workerManager.ts rename to src/language/css/workerManager.ts index d00ac2df..d26fa6fc 100644 --- a/src/css/workerManager.ts +++ b/src/language/css/workerManager.ts @@ -5,7 +5,7 @@ import { LanguageServiceDefaults } from './monaco.contribution'; import type { CSSWorker } from './cssWorker'; -import { editor, IDisposable, Uri } from '../fillers/monaco-editor-core'; +import { editor, IDisposable, Uri } from '../../fillers/monaco-editor-core'; const STOP_WHEN_IDLE_FOR = 2 * 60 * 1000; // 2min diff --git a/src/html/html.worker.ts b/src/language/html/html.worker.ts similarity index 100% rename from src/html/html.worker.ts rename to src/language/html/html.worker.ts diff --git a/src/html/htmlMode.ts b/src/language/html/htmlMode.ts similarity index 98% rename from src/html/htmlMode.ts rename to src/language/html/htmlMode.ts index 34e220f0..365118b2 100644 --- a/src/html/htmlMode.ts +++ b/src/language/html/htmlMode.ts @@ -7,7 +7,7 @@ import { WorkerManager } from './workerManager'; import type { HTMLWorker } from './htmlWorker'; import { LanguageServiceDefaults } from './monaco.contribution'; import * as languageFeatures from '../common/lspLanguageFeatures'; -import { Uri, IDisposable, languages } from '../fillers/monaco-editor-core'; +import { Uri, IDisposable, languages } from '../../fillers/monaco-editor-core'; class HTMLCompletionAdapter extends languageFeatures.CompletionAdapter { constructor(worker: languageFeatures.WorkerAccessor) { diff --git a/src/html/htmlWorker.ts b/src/language/html/htmlWorker.ts similarity index 98% rename from src/html/htmlWorker.ts rename to src/language/html/htmlWorker.ts index b0930be0..57113c05 100644 --- a/src/html/htmlWorker.ts +++ b/src/language/html/htmlWorker.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { worker } from '../fillers/monaco-editor-core'; +import { worker } from '../../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/src/html/monaco.contribution.ts b/src/language/html/monaco.contribution.ts similarity index 99% rename from src/html/monaco.contribution.ts rename to src/language/html/monaco.contribution.ts index 57412060..817f8dfb 100644 --- a/src/html/monaco.contribution.ts +++ b/src/language/html/monaco.contribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as mode from './htmlMode'; -import { languages, Emitter, IEvent, IDisposable } from '../fillers/monaco-editor-core'; +import { languages, Emitter, IEvent, IDisposable } from '../../fillers/monaco-editor-core'; export interface HTMLFormatConfiguration { readonly tabSize: number; diff --git a/src/html/workerManager.ts b/src/language/html/workerManager.ts similarity index 97% rename from src/html/workerManager.ts rename to src/language/html/workerManager.ts index e3741bf0..4f48aa12 100644 --- a/src/html/workerManager.ts +++ b/src/language/html/workerManager.ts @@ -5,7 +5,7 @@ import { LanguageServiceDefaults } from './monaco.contribution'; import type { HTMLWorker } from './htmlWorker'; -import { Uri, IDisposable, editor } from '../fillers/monaco-editor-core'; +import { Uri, IDisposable, editor } from '../../fillers/monaco-editor-core'; const STOP_WHEN_IDLE_FOR = 2 * 60 * 1000; // 2min diff --git a/src/json/json.worker.ts b/src/language/json/json.worker.ts similarity index 100% rename from src/json/json.worker.ts rename to src/language/json/json.worker.ts diff --git a/src/json/jsonMode.ts b/src/language/json/jsonMode.ts similarity index 98% rename from src/json/jsonMode.ts rename to src/language/json/jsonMode.ts index e88106a1..2133e848 100644 --- a/src/json/jsonMode.ts +++ b/src/language/json/jsonMode.ts @@ -8,7 +8,7 @@ import type { JSONWorker } from './jsonWorker'; import { LanguageServiceDefaults } from './monaco.contribution'; import * as languageFeatures from '../common/lspLanguageFeatures'; import { createTokenizationSupport } from './tokenization'; -import { Uri, IDisposable, languages, editor } from '../fillers/monaco-editor-core'; +import { Uri, IDisposable, languages, editor } from '../../fillers/monaco-editor-core'; class JSONDiagnosticsAdapter extends languageFeatures.DiagnosticsAdapter { constructor( diff --git a/src/json/jsonWorker.ts b/src/language/json/jsonWorker.ts similarity index 99% rename from src/json/jsonWorker.ts rename to src/language/json/jsonWorker.ts index fa486329..d18a83de 100644 --- a/src/json/jsonWorker.ts +++ b/src/language/json/jsonWorker.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as jsonService from 'vscode-json-languageservice'; -import type { worker } from '../fillers/monaco-editor-core'; +import type { worker } from '../../fillers/monaco-editor-core'; import { URI } from 'vscode-uri'; import { DiagnosticsOptions } from './monaco.contribution'; diff --git a/src/json/monaco.contribution.ts b/src/language/json/monaco.contribution.ts similarity index 98% rename from src/json/monaco.contribution.ts rename to src/language/json/monaco.contribution.ts index 958b5537..3f9544c6 100644 --- a/src/json/monaco.contribution.ts +++ b/src/language/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/src/json/tokenization.ts b/src/language/json/tokenization.ts similarity index 99% rename from src/json/tokenization.ts rename to src/language/json/tokenization.ts index d7088a44..f52c1511 100644 --- a/src/json/tokenization.ts +++ b/src/language/json/tokenization.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as json from 'jsonc-parser'; -import { languages } from '../fillers/monaco-editor-core'; +import { languages } from '../../fillers/monaco-editor-core'; export function createTokenizationSupport(supportComments: boolean): languages.TokensProvider { return { diff --git a/src/json/workerManager.ts b/src/language/json/workerManager.ts similarity index 97% rename from src/json/workerManager.ts rename to src/language/json/workerManager.ts index 06e04eb7..d0cf7068 100644 --- a/src/json/workerManager.ts +++ b/src/language/json/workerManager.ts @@ -5,7 +5,7 @@ import { LanguageServiceDefaults } from './monaco.contribution'; import type { JSONWorker } from './jsonWorker'; -import { IDisposable, Uri, editor } from '../fillers/monaco-editor-core'; +import { IDisposable, Uri, editor } from '../../fillers/monaco-editor-core'; const STOP_WHEN_IDLE_FOR = 2 * 60 * 1000; // 2min diff --git a/src/typescript/languageFeatures.ts b/src/language/typescript/languageFeatures.ts similarity index 99% rename from src/typescript/languageFeatures.ts rename to src/language/typescript/languageFeatures.ts index 9157877a..de615ae8 100644 --- a/src/typescript/languageFeatures.ts +++ b/src/language/typescript/languageFeatures.ts @@ -23,7 +23,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/src/typescript/lib/editor.worker.d.ts b/src/language/typescript/lib/editor.worker.d.ts similarity index 100% rename from src/typescript/lib/editor.worker.d.ts rename to src/language/typescript/lib/editor.worker.d.ts diff --git a/src/typescript/lib/lib.index.ts b/src/language/typescript/lib/lib.index.ts similarity index 100% rename from src/typescript/lib/lib.index.ts rename to src/language/typescript/lib/lib.index.ts diff --git a/src/typescript/lib/lib.ts b/src/language/typescript/lib/lib.ts similarity index 100% rename from src/typescript/lib/lib.ts rename to src/language/typescript/lib/lib.ts diff --git a/src/typescript/lib/typescriptServices-amd.js b/src/language/typescript/lib/typescriptServices-amd.js similarity index 100% rename from src/typescript/lib/typescriptServices-amd.js rename to src/language/typescript/lib/typescriptServices-amd.js diff --git a/src/typescript/lib/typescriptServices.d.ts b/src/language/typescript/lib/typescriptServices.d.ts similarity index 100% rename from src/typescript/lib/typescriptServices.d.ts rename to src/language/typescript/lib/typescriptServices.d.ts diff --git a/src/typescript/lib/typescriptServices.js b/src/language/typescript/lib/typescriptServices.js similarity index 100% rename from src/typescript/lib/typescriptServices.js rename to src/language/typescript/lib/typescriptServices.js diff --git a/src/typescript/lib/typescriptServicesMetadata.ts b/src/language/typescript/lib/typescriptServicesMetadata.ts similarity index 100% rename from src/typescript/lib/typescriptServicesMetadata.ts rename to src/language/typescript/lib/typescriptServicesMetadata.ts diff --git a/src/typescript/monaco.contribution.ts b/src/language/typescript/monaco.contribution.ts similarity index 99% rename from src/typescript/monaco.contribution.ts rename to src/language/typescript/monaco.contribution.ts index e47262f5..ce465dfe 100644 --- a/src/typescript/monaco.contribution.ts +++ b/src/language/typescript/monaco.contribution.ts @@ -5,7 +5,7 @@ import type * as mode from './tsMode'; import { typescriptVersion as tsversion } from './lib/typescriptServicesMetadata'; // do not import the whole typescriptServices here -import { languages, Emitter, IEvent, IDisposable, Uri } from '../fillers/monaco-editor-core'; +import { languages, Emitter, IEvent, IDisposable, Uri } from '../../fillers/monaco-editor-core'; //#region enums copied from typescript to prevent loading the entire typescriptServices --- diff --git a/src/typescript/ts.worker.ts b/src/language/typescript/ts.worker.ts similarity index 92% rename from src/typescript/ts.worker.ts rename to src/language/typescript/ts.worker.ts index 317fbd43..f03e32d1 100644 --- a/src/typescript/ts.worker.ts +++ b/src/language/typescript/ts.worker.ts @@ -5,7 +5,7 @@ import * as edworker from 'monaco-editor-core/esm/vs/editor/editor.worker'; import { ICreateData, create } 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/src/typescript/tsMode.ts b/src/language/typescript/tsMode.ts similarity index 97% rename from src/typescript/tsMode.ts rename to src/language/typescript/tsMode.ts index 71d0200f..63a4dbbd 100644 --- a/src/typescript/tsMode.ts +++ b/src/language/typescript/tsMode.ts @@ -7,7 +7,7 @@ import { WorkerManager } from './workerManager'; import type { TypeScriptWorker } from './tsWorker'; import { LanguageServiceDefaults } from './monaco.contribution'; import * as languageFeatures from './languageFeatures'; -import { languages, 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/src/typescript/tsWorker.ts b/src/language/typescript/tsWorker.ts similarity index 99% rename from src/typescript/tsWorker.ts rename to src/language/typescript/tsWorker.ts index a0663f91..a6f10943 100644 --- a/src/typescript/tsWorker.ts +++ b/src/language/typescript/tsWorker.ts @@ -11,7 +11,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/src/typescript/workerManager.ts b/src/language/typescript/workerManager.ts similarity index 97% rename from src/typescript/workerManager.ts rename to src/language/typescript/workerManager.ts index 8a21f2e6..08a676a1 100644 --- a/src/typescript/workerManager.ts +++ b/src/language/typescript/workerManager.ts @@ -5,7 +5,7 @@ import { LanguageServiceDefaults } from './monaco.contribution'; import type { TypeScriptWorker } from './tsWorker'; -import { editor, Uri, IDisposable } from '../fillers/monaco-editor-core'; +import { editor, Uri, IDisposable } from '../../fillers/monaco-editor-core'; export class WorkerManager { private _modeId: string; diff --git a/test/manual/dev-setup.js b/test/manual/dev-setup.js index 2ebaf5a3..42835a4f 100644 --- a/test/manual/dev-setup.js +++ b/test/manual/dev-setup.js @@ -209,13 +209,9 @@ let loaderPathsConfig = {}; window.AMD = true; if (IS_FILE_PROTOCOL) { - loaderPathsConfig['vs/language/fillers/monaco-editor-core'] = - DIRNAME + '/../.././out/amd/fillers/monaco-editor-core-amd'; loaderPathsConfig['vs/fillers/monaco-editor-core'] = DIRNAME + '/../.././out/amd/fillers/monaco-editor-core-amd'; } else { - loaderPathsConfig['vs/language/fillers/monaco-editor-core'] = - PATH_PREFIX + '/monaco-editor/./out/amd/fillers/monaco-editor-core-amd'; loaderPathsConfig['vs/fillers/monaco-editor-core'] = PATH_PREFIX + '/monaco-editor/./out/amd/fillers/monaco-editor-core-amd'; }