mirror of
https://github.com/microsoft/monaco-editor.git
synced 2025-12-22 12:45:39 +01:00
Moves src/{typescript,css,...} to src/language/{typescript,css,...} to align with the released paths
This commit is contained in:
parent
9eb7c18143
commit
91edee5791
35 changed files with 85 additions and 81 deletions
|
|
@ -16,7 +16,7 @@ import {
|
|||
IDisposable,
|
||||
MarkerSeverity,
|
||||
IEvent
|
||||
} from '../fillers/monaco-editor-core';
|
||||
} from '../../fillers/monaco-editor-core';
|
||||
|
||||
export interface WorkerAccessor<T> {
|
||||
(...more: Uri[]): Promise<T>;
|
||||
|
|
@ -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[] = [];
|
||||
|
|
@ -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';
|
||||
|
||||
|
|
@ -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;
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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<HTMLWorker> {
|
||||
constructor(worker: languageFeatures.WorkerAccessor<HTMLWorker>) {
|
||||
|
|
@ -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';
|
||||
|
|
@ -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;
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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<JSONWorker> {
|
||||
constructor(
|
||||
|
|
@ -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';
|
||||
|
||||
|
|
@ -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 ---------
|
||||
|
||||
|
|
@ -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 {
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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 ---
|
||||
|
||||
|
|
@ -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 ---
|
||||
|
||||
|
|
@ -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
|
||||
|
|
@ -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<TypeScriptWorker>;
|
||||
let typeScriptWorker: (...uris: Uri[]) => Promise<TypeScriptWorker>;
|
||||
|
|
@ -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.
|
||||
|
|
@ -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;
|
||||
Loading…
Add table
Add a link
Reference in a new issue