github-forks
/
monaco-editor
mirror of https://github.com/microsoft/monaco-editor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Run `prettier`

Browse Source
pull/2769/head
Alex Dima 3 years ago
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
Show Stats Download Patch File Download Diff File

2
.prettierignore
Unescape Escape View File

@ -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/

5
build/build.js
Unescape Escape View File

@ -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`);

18
monaco-editor-samples/browser-esm-vite-react/index.html
Unescape Escape View File

@ -1,12 +1,12 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>browser-esm-vite-react</title> <title>browser-esm-vite-react</title>
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>
<script type="module" src="/src/main.tsx"></script> <script type="module" src="/src/main.tsx"></script>
</body> </body>
</html> </html>

1744
monaco-editor-samples/browser-esm-vite-react/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

34
monaco-editor-samples/browser-esm-vite-react/package.json
Unescape Escape View File

@ -1,19 +1,19 @@
{ {
"name": "browser-esm-vite-react", "name": "browser-esm-vite-react",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build": "tsc && vite build", "build": "tsc && vite build",
"serve": "vite preview" "serve": "vite preview"
}, },
"dependencies": {}, "dependencies": {},
"devDependencies": { "devDependencies": {
"monaco-editor": "^0.30.1", "monaco-editor": "^0.30.1",
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.0", "react-dom": "^17.0.0",
"@types/react": "^17.0.0", "@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0", "@types/react-dom": "^17.0.0",
"@vitejs/plugin-react": "^1.0.0", "@vitejs/plugin-react": "^1.0.0",
"typescript": "^4.4.4", "typescript": "^4.4.4",
"vite": "^2.6.14" "vite": "^2.6.14"
} }
} }

6
monaco-editor-samples/browser-esm-vite-react/src/components/Editor.module.css
Unescape Escape View File

@ -1,4 +1,4 @@
.Editor { .Editor {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
} }

35
monaco-editor-samples/browser-esm-vite-react/src/components/Editor.tsx
Unescape Escape View File

@ -1,24 +1,23 @@
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(() => {
if (monacoEl && !editor) { if (monacoEl && !editor) {
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'
}) })
); );
} }
return () => editor?.dispose(); return () => editor?.dispose();
}, [monacoEl.current]); }, [monacoEl.current]);
return <div className={styles.Editor} ref={monacoEl}></div>; return <div className={styles.Editor} ref={monacoEl}></div>;
}; };

18
monaco-editor-samples/browser-esm-vite-react/src/main.tsx
Unescape Escape View File

@ -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')
) );

42
monaco-editor-samples/browser-esm-vite-react/src/userWorker.ts
Unescape Escape View File

@ -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);

18
monaco-editor-samples/browser-esm-vite-react/tsconfig.json
Unescape Escape View File

@ -1,11 +1,11 @@
{ {
"compilerOptions": { "compilerOptions": {
"target": "ESNext", "target": "ESNext",
"strict": true, "strict": true,
"module": "ESNext", "module": "ESNext",
"jsx": "react-jsx", "jsx": "react-jsx",
"moduleResolution": "node", "moduleResolution": "node",
"allowSyntheticDefaultImports": true "allowSyntheticDefaultImports": true
}, },
"include": ["./src"] "include": ["./src"]
} }

8
monaco-editor-samples/browser-esm-vite-react/vite.config.ts
Unescape Escape View File

@ -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()]
}) });

17
src/json/languageFeatures.ts
Unescape Escape View File

@ -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;

3
src/json/tokenization.ts
Unescape Escape View File

@ -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)
}; };
} }

30
test/unit/all.js
Unescape Escape View File

@ -35,21 +35,25 @@ 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(
if (err) { 'out/amd/basic-languages/*/*.test.js',
console.log(err); { cwd: path.join(__dirname, '../../') },
return; function (err, files) {
} if (err) {
requirejs(
files.map((f) => f.replace(/^out\/amd/, 'vs').replace(/\.js$/, '')),
function () {
// We can launch the tests!
},
function (err) {
console.log(err); console.log(err);
return;
} }
); requirejs(
}); files.map((f) => f.replace(/^out\/amd/, 'vs').replace(/\.js$/, '')),
function () {
// We can launch the tests!
},
function (err) {
console.log(err);
}
);
}
);
}, },
function (err) { function (err) {
console.log(err); console.log(err);

Write Preview
Loading…
Cancel
Save