SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 11:35:40 +01:00
Code Issues Projects Releases Packages Activity

Run prettier

Browse source
This commit is contained in:
Alex Dima 2021-11-15 09:37:13 +01:00
parent a66f20ee2e
commit edb439d4f6
No known key found for this signature in database
GPG key ID: 39563C1504FDD0C9
14 changed files with 998 additions and 982 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.prettierignore
View file

@ -1,6 +1,7 @@
/out/
/monaco-editor-samples/browser-esm-parcel/.cache/
/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-monaco-plugin/dist/*.js
/monaco-editor-samples/browser-esm-webpack-small/dist/*.js
@ -12,5 +13,6 @@
/monaco-editor/typedoc/monaco.d.ts
/monaco-editor/website/lib/
/monaco-editor-webpack-plugin/test/dist/*.js
/monaco-editor-webpack-plugin/out/
/release/
/src/typescript/lib/

5
build/build.js
View file

@ -167,7 +167,10 @@ glob('../src/basic-languages/*/*.contribution.ts', { cwd: __dirname }, function
// ESM
{
/** @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'];
for (const language of languages) {
entryPoints.push(`src/basic-languages/${language}/${language}.contribution.ts`);

11
monaco-editor-samples/browser-esm-vite-react/src/components/Editor.tsx
View file

@ -1,10 +1,9 @@
import { VFC, useRef, useState, useEffect } from "react";
import * as monaco from "monaco-editor/esm/vs/editor/editor.api";
import styles from "./Editor.module.css";
import { VFC, useRef, useState, useEffect } from 'react';
import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
import styles from './Editor.module.css';
export const Editor: VFC = () => {
const [editor, setEditor] =
useState<monaco.editor.IStandaloneCodeEditor | null>(null);
const [editor, setEditor] = useState<monaco.editor.IStandaloneCodeEditor | null>(null);
const monacoEl = useRef(null);
useEffect(() => {
@ -12,7 +11,7 @@ export const Editor: VFC = () => {
setEditor(
monaco.editor.create(monacoEl.current!, {
value: ['function x() {', '\tconsole.log("Hello world!");', '}'].join('\n'),
language: "typescript",
language: 'typescript'
})
);
}

10
monaco-editor-samples/browser-esm-vite-react/src/main.tsx
View file

@ -1,11 +1,11 @@
import React from 'react'
import ReactDOM from 'react-dom'
import {Editor} from './components/Editor'
import "./userWorker";
import React from 'react';
import ReactDOM from 'react-dom';
import { Editor } from './components/Editor';
import './userWorker';
ReactDOM.render(
<React.StrictMode>
<Editor />
</React.StrictMode>,
document.getElementById('root')
)
);

22
monaco-editor-samples/browser-esm-vite-react/src/userWorker.ts
View file

@ -1,27 +1,27 @@
import * as monaco from "monaco-editor";
import editorWorker from "monaco-editor/esm/vs/editor/editor.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 htmlWorker from "monaco-editor/esm/vs/language/html/html.worker?worker";
import tsWorker from "monaco-editor/esm/vs/language/typescript/ts.worker?worker";
import * as monaco from 'monaco-editor';
import editorWorker from 'monaco-editor/esm/vs/editor/editor.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 htmlWorker from 'monaco-editor/esm/vs/language/html/html.worker?worker';
import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker';
// @ts-ignore
self.MonacoEnvironment = {
getWorker(_: any, label: string) {
if (label === "json") {
if (label === 'json') {
return new jsonWorker();
}
if (label === "css" || label === "scss" || label === "less") {
if (label === 'css' || label === 'scss' || label === 'less') {
return new cssWorker();
}
if (label === "html" || label === "handlebars" || label === "razor") {
if (label === 'html' || label === 'handlebars' || label === 'razor') {
return new htmlWorker();
}
if (label === "typescript" || label === "javascript") {
if (label === 'typescript' || label === 'javascript') {
return new tsWorker();
}
return new editorWorker();
},
}
};
monaco.languages.typescript.typescriptDefaults.setEagerModelSync(true);

6
monaco-editor-samples/browser-esm-vite-react/vite.config.ts
View file

@ -1,7 +1,7 @@
import { defineConfig } from 'vite'
import react from '@vitejs/plugin-react'
import { defineConfig } from 'vite';
import react from '@vitejs/plugin-react';
// https://vitejs.dev/config/
export default defineConfig({
plugins: [react()]
})
});

17
src/json/languageFeatures.ts
View file

@ -383,7 +383,8 @@ export class CompletionAdapter implements languages.CompletionItemProvider {
item.insertText = entry.textEdit.newText;
}
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) {
item.insertTextRules = languages.CompletionItemInsertTextRule.InsertAsSnippet;
@ -649,7 +650,8 @@ export class DocumentColorAdapter implements languages.DocumentColorProvider {
item.textEdit = toTextEdit(presentation.textEdit);
}
if (presentation.additionalTextEdits) {
item.additionalTextEdits = presentation.additionalTextEdits.map<languages.TextEdit>(toTextEdit);
item.additionalTextEdits =
presentation.additionalTextEdits.map<languages.TextEdit>(toTextEdit);
}
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) {
case lsTypes.FoldingRangeKind.Comment:
return languages.FoldingRangeKind.Comment;
@ -710,7 +714,12 @@ export class SelectionRangeAdapter implements languages.SelectionRangeProvider {
const resource = model.uri;
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) => {
if (!selectionRanges) {
return;

3
src/json/tokenization.ts
View file

@ -9,8 +9,7 @@ import { languages } from '../fillers/monaco-editor-core';
export function createTokenizationSupport(supportComments: boolean): languages.TokensProvider {
return {
getInitialState: () => new JSONState(null, null, false, null),
tokenize: (line, state?) =>
tokenize(supportComments, line, <JSONState>state)
tokenize: (line, state?) => tokenize(supportComments, line, <JSONState>state)
};
}

8
test/unit/all.js
View file

@ -35,7 +35,10 @@ global.window = {
requirejs(
['test/unit/setup'],
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) {
console.log(err);
return;
@ -49,7 +52,8 @@ requirejs(
console.log(err);
}
);
});
}
);
},
function (err) {
console.log(err);