mirror of
https://github.com/microsoft/monaco-editor.git
synced 2025-12-22 17:25:39 +01:00
Run prettier
This commit is contained in:
parent
a66f20ee2e
commit
edb439d4f6
14 changed files with 998 additions and 982 deletions
|
|
@ -1,6 +1,7 @@
|
||||||
/out/
|
/out/
|
||||||
/monaco-editor-samples/browser-esm-parcel/.cache/
|
/monaco-editor-samples/browser-esm-parcel/.cache/
|
||||||
/monaco-editor-samples/browser-esm-parcel/dist/
|
/monaco-editor-samples/browser-esm-parcel/dist/
|
||||||
|
/monaco-editor-samples/browser-esm-vite-react/dist/**/*.js
|
||||||
/monaco-editor-samples/browser-esm-webpack/dist/*.js
|
/monaco-editor-samples/browser-esm-webpack/dist/*.js
|
||||||
/monaco-editor-samples/browser-esm-webpack-monaco-plugin/dist/*.js
|
/monaco-editor-samples/browser-esm-webpack-monaco-plugin/dist/*.js
|
||||||
/monaco-editor-samples/browser-esm-webpack-small/dist/*.js
|
/monaco-editor-samples/browser-esm-webpack-small/dist/*.js
|
||||||
|
|
@ -12,5 +13,6 @@
|
||||||
/monaco-editor/typedoc/monaco.d.ts
|
/monaco-editor/typedoc/monaco.d.ts
|
||||||
/monaco-editor/website/lib/
|
/monaco-editor/website/lib/
|
||||||
/monaco-editor-webpack-plugin/test/dist/*.js
|
/monaco-editor-webpack-plugin/test/dist/*.js
|
||||||
|
/monaco-editor-webpack-plugin/out/
|
||||||
/release/
|
/release/
|
||||||
/src/typescript/lib/
|
/src/typescript/lib/
|
||||||
|
|
|
||||||
|
|
@ -167,7 +167,10 @@ glob('../src/basic-languages/*/*.contribution.ts', { cwd: __dirname }, function
|
||||||
// ESM
|
// ESM
|
||||||
{
|
{
|
||||||
/** @type {string[]} */
|
/** @type {string[]} */
|
||||||
const entryPoints = ['src/basic-languages/monaco.contribution.ts', 'src/basic-languages/_.contribution.ts'];
|
const entryPoints = [
|
||||||
|
'src/basic-languages/monaco.contribution.ts',
|
||||||
|
'src/basic-languages/_.contribution.ts'
|
||||||
|
];
|
||||||
const external = ['monaco-editor-core', '*/_.contribution'];
|
const external = ['monaco-editor-core', '*/_.contribution'];
|
||||||
for (const language of languages) {
|
for (const language of languages) {
|
||||||
entryPoints.push(`src/basic-languages/${language}/${language}.contribution.ts`);
|
entryPoints.push(`src/basic-languages/${language}/${language}.contribution.ts`);
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,9 @@
|
||||||
import { VFC, useRef, useState, useEffect } from "react";
|
import { VFC, useRef, useState, useEffect } from 'react';
|
||||||
import * as monaco from "monaco-editor/esm/vs/editor/editor.api";
|
import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
|
||||||
import styles from "./Editor.module.css";
|
import styles from './Editor.module.css';
|
||||||
|
|
||||||
export const Editor: VFC = () => {
|
export const Editor: VFC = () => {
|
||||||
const [editor, setEditor] =
|
const [editor, setEditor] = useState<monaco.editor.IStandaloneCodeEditor | null>(null);
|
||||||
useState<monaco.editor.IStandaloneCodeEditor | null>(null);
|
|
||||||
const monacoEl = useRef(null);
|
const monacoEl = useRef(null);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|
@ -12,7 +11,7 @@ export const Editor: VFC = () => {
|
||||||
setEditor(
|
setEditor(
|
||||||
monaco.editor.create(monacoEl.current!, {
|
monaco.editor.create(monacoEl.current!, {
|
||||||
value: ['function x() {', '\tconsole.log("Hello world!");', '}'].join('\n'),
|
value: ['function x() {', '\tconsole.log("Hello world!");', '}'].join('\n'),
|
||||||
language: "typescript",
|
language: 'typescript'
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
import React from 'react'
|
import React from 'react';
|
||||||
import ReactDOM from 'react-dom'
|
import ReactDOM from 'react-dom';
|
||||||
import {Editor} from './components/Editor'
|
import { Editor } from './components/Editor';
|
||||||
import "./userWorker";
|
import './userWorker';
|
||||||
|
|
||||||
ReactDOM.render(
|
ReactDOM.render(
|
||||||
<React.StrictMode>
|
<React.StrictMode>
|
||||||
<Editor />
|
<Editor />
|
||||||
</React.StrictMode>,
|
</React.StrictMode>,
|
||||||
document.getElementById('root')
|
document.getElementById('root')
|
||||||
)
|
);
|
||||||
|
|
|
||||||
|
|
@ -1,27 +1,27 @@
|
||||||
import * as monaco from "monaco-editor";
|
import * as monaco from 'monaco-editor';
|
||||||
import editorWorker from "monaco-editor/esm/vs/editor/editor.worker?worker";
|
import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker';
|
||||||
import jsonWorker from "monaco-editor/esm/vs/language/json/json.worker?worker";
|
import jsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker';
|
||||||
import cssWorker from "monaco-editor/esm/vs/language/css/css.worker?worker";
|
import cssWorker from 'monaco-editor/esm/vs/language/css/css.worker?worker';
|
||||||
import htmlWorker from "monaco-editor/esm/vs/language/html/html.worker?worker";
|
import htmlWorker from 'monaco-editor/esm/vs/language/html/html.worker?worker';
|
||||||
import tsWorker from "monaco-editor/esm/vs/language/typescript/ts.worker?worker";
|
import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker';
|
||||||
|
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
self.MonacoEnvironment = {
|
self.MonacoEnvironment = {
|
||||||
getWorker(_: any, label: string) {
|
getWorker(_: any, label: string) {
|
||||||
if (label === "json") {
|
if (label === 'json') {
|
||||||
return new jsonWorker();
|
return new jsonWorker();
|
||||||
}
|
}
|
||||||
if (label === "css" || label === "scss" || label === "less") {
|
if (label === 'css' || label === 'scss' || label === 'less') {
|
||||||
return new cssWorker();
|
return new cssWorker();
|
||||||
}
|
}
|
||||||
if (label === "html" || label === "handlebars" || label === "razor") {
|
if (label === 'html' || label === 'handlebars' || label === 'razor') {
|
||||||
return new htmlWorker();
|
return new htmlWorker();
|
||||||
}
|
}
|
||||||
if (label === "typescript" || label === "javascript") {
|
if (label === 'typescript' || label === 'javascript') {
|
||||||
return new tsWorker();
|
return new tsWorker();
|
||||||
}
|
}
|
||||||
return new editorWorker();
|
return new editorWorker();
|
||||||
},
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
monaco.languages.typescript.typescriptDefaults.setEagerModelSync(true);
|
monaco.languages.typescript.typescriptDefaults.setEagerModelSync(true);
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
import { defineConfig } from 'vite'
|
import { defineConfig } from 'vite';
|
||||||
import react from '@vitejs/plugin-react'
|
import react from '@vitejs/plugin-react';
|
||||||
|
|
||||||
// https://vitejs.dev/config/
|
// https://vitejs.dev/config/
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
plugins: [react()]
|
plugins: [react()]
|
||||||
})
|
});
|
||||||
|
|
|
||||||
|
|
@ -383,7 +383,8 @@ export class CompletionAdapter implements languages.CompletionItemProvider {
|
||||||
item.insertText = entry.textEdit.newText;
|
item.insertText = entry.textEdit.newText;
|
||||||
}
|
}
|
||||||
if (entry.additionalTextEdits) {
|
if (entry.additionalTextEdits) {
|
||||||
item.additionalTextEdits = entry.additionalTextEdits.map<languages.TextEdit>(toTextEdit);
|
item.additionalTextEdits =
|
||||||
|
entry.additionalTextEdits.map<languages.TextEdit>(toTextEdit);
|
||||||
}
|
}
|
||||||
if (entry.insertTextFormat === lsTypes.InsertTextFormat.Snippet) {
|
if (entry.insertTextFormat === lsTypes.InsertTextFormat.Snippet) {
|
||||||
item.insertTextRules = languages.CompletionItemInsertTextRule.InsertAsSnippet;
|
item.insertTextRules = languages.CompletionItemInsertTextRule.InsertAsSnippet;
|
||||||
|
|
@ -649,7 +650,8 @@ export class DocumentColorAdapter implements languages.DocumentColorProvider {
|
||||||
item.textEdit = toTextEdit(presentation.textEdit);
|
item.textEdit = toTextEdit(presentation.textEdit);
|
||||||
}
|
}
|
||||||
if (presentation.additionalTextEdits) {
|
if (presentation.additionalTextEdits) {
|
||||||
item.additionalTextEdits = presentation.additionalTextEdits.map<languages.TextEdit>(toTextEdit);
|
item.additionalTextEdits =
|
||||||
|
presentation.additionalTextEdits.map<languages.TextEdit>(toTextEdit);
|
||||||
}
|
}
|
||||||
return item;
|
return item;
|
||||||
});
|
});
|
||||||
|
|
@ -687,7 +689,9 @@ export class FoldingRangeAdapter implements languages.FoldingRangeProvider {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function toFoldingRangeKind(kind: lsTypes.FoldingRangeKind): languages.FoldingRangeKind | undefined {
|
function toFoldingRangeKind(
|
||||||
|
kind: lsTypes.FoldingRangeKind
|
||||||
|
): languages.FoldingRangeKind | undefined {
|
||||||
switch (kind) {
|
switch (kind) {
|
||||||
case lsTypes.FoldingRangeKind.Comment:
|
case lsTypes.FoldingRangeKind.Comment:
|
||||||
return languages.FoldingRangeKind.Comment;
|
return languages.FoldingRangeKind.Comment;
|
||||||
|
|
@ -710,7 +714,12 @@ export class SelectionRangeAdapter implements languages.SelectionRangeProvider {
|
||||||
const resource = model.uri;
|
const resource = model.uri;
|
||||||
|
|
||||||
return this._worker(resource)
|
return this._worker(resource)
|
||||||
.then((worker) => worker.getSelectionRanges(resource.toString(), positions.map<lsTypes.Position>(fromPosition)))
|
.then((worker) =>
|
||||||
|
worker.getSelectionRanges(
|
||||||
|
resource.toString(),
|
||||||
|
positions.map<lsTypes.Position>(fromPosition)
|
||||||
|
)
|
||||||
|
)
|
||||||
.then((selectionRanges) => {
|
.then((selectionRanges) => {
|
||||||
if (!selectionRanges) {
|
if (!selectionRanges) {
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
|
|
@ -9,8 +9,7 @@ import { languages } from '../fillers/monaco-editor-core';
|
||||||
export function createTokenizationSupport(supportComments: boolean): languages.TokensProvider {
|
export function createTokenizationSupport(supportComments: boolean): languages.TokensProvider {
|
||||||
return {
|
return {
|
||||||
getInitialState: () => new JSONState(null, null, false, null),
|
getInitialState: () => new JSONState(null, null, false, null),
|
||||||
tokenize: (line, state?) =>
|
tokenize: (line, state?) => tokenize(supportComments, line, <JSONState>state)
|
||||||
tokenize(supportComments, line, <JSONState>state)
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,10 @@ global.window = {
|
||||||
requirejs(
|
requirejs(
|
||||||
['test/unit/setup'],
|
['test/unit/setup'],
|
||||||
function () {
|
function () {
|
||||||
glob('out/amd/basic-languages/*/*.test.js', { cwd: path.join(__dirname, '../../') }, function (err, files) {
|
glob(
|
||||||
|
'out/amd/basic-languages/*/*.test.js',
|
||||||
|
{ cwd: path.join(__dirname, '../../') },
|
||||||
|
function (err, files) {
|
||||||
if (err) {
|
if (err) {
|
||||||
console.log(err);
|
console.log(err);
|
||||||
return;
|
return;
|
||||||
|
|
@ -49,7 +52,8 @@ requirejs(
|
||||||
console.log(err);
|
console.log(err);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
});
|
}
|
||||||
|
);
|
||||||
},
|
},
|
||||||
function (err) {
|
function (err) {
|
||||||
console.log(err);
|
console.log(err);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue