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

Set printWidth to 100

Browse source
This commit is contained in:
Alex Dima 2020-09-19 01:52:42 +02:00
parent e45e533d24
commit 47b7fd3e2d
No known key found for this signature in database
GPG key ID: 6E58D7B045760DA0
12 changed files with 77 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.prettierrc
View file

@ -3,5 +3,6 @@
"singleQuote": true,
"trailingComma": "none",
"semi": true,
"useTabs": true
"useTabs": true,
"printWidth": 100
}

6
monaco.d.ts vendored
View file

@ -18,11 +18,7 @@ declare namespace monaco.languages.html {
readonly indentHandlebars: boolean;
readonly endWithNewline: boolean;
readonly extraLiners: string;
readonly wrapAttributes:
| 'auto'
| 'force'
| 'force-aligned'
| 'force-expand-multiline';
readonly wrapAttributes: 'auto' | 'force' | 'force-aligned' | 'force-expand-multiline';
}
export interface CompletionConfiguration {
[provider: string]: boolean;

25
scripts/bundle.js
View file

@ -40,26 +40,17 @@ function bundleOne(moduleId, exclude) {
packages: [
{
name: 'vscode-html-languageservice',
location: path.join(
REPO_ROOT,
'node_modules/vscode-html-languageservice/lib/umd'
),
location: path.join(REPO_ROOT, 'node_modules/vscode-html-languageservice/lib/umd'),
main: 'htmlLanguageService'
},
{
name: 'vscode-languageserver-types',
location: path.join(
REPO_ROOT,
'node_modules/vscode-languageserver-types/lib/umd'
),
location: path.join(REPO_ROOT, 'node_modules/vscode-languageserver-types/lib/umd'),
main: 'main'
},
{
name: 'vscode-languageserver-textdocument',
location: path.join(
REPO_ROOT,
'node_modules/vscode-languageserver-textdocument/lib/umd'
),
location: path.join(REPO_ROOT, 'node_modules/vscode-languageserver-textdocument/lib/umd'),
main: 'main'
},
{
@ -75,14 +66,8 @@ function bundleOne(moduleId, exclude) {
]
},
async function (buildResponse) {
const devFilePath = path.join(
REPO_ROOT,
'release/dev/' + moduleId + '.js'
);
const minFilePath = path.join(
REPO_ROOT,
'release/min/' + moduleId + '.js'
);
const devFilePath = path.join(REPO_ROOT, 'release/dev/' + moduleId + '.js');
const minFilePath = path.join(REPO_ROOT, 'release/min/' + moduleId + '.js');
const fileContents = fs.readFileSync(devFilePath).toString();
console.log();
console.log(`Minifying ${devFilePath}...`);

6
src/fillers/vscode-nls.ts
View file

@ -33,11 +33,7 @@ function format(message: string, args: any[]): string {
return result;
}
function localize(
key: string | LocalizeInfo,
message: string,
...args: any[]
): string {
function localize(key: string | LocalizeInfo, message: string, ...args: any[]): string {
return format(message, args);
}

42
src/htmlMode.ts
View file

@ -12,9 +12,7 @@ import { Uri, IDisposable, languages } from './fillers/monaco-editor-core';
export function setupMode1(defaults: LanguageServiceDefaults): void {
const client = new WorkerManager(defaults);
const worker: languageFeatures.WorkerAccessor = (
...uris: Uri[]
): Promise<HTMLWorker> => {
const worker: languageFeatures.WorkerAccessor = (...uris: Uri[]): Promise<HTMLWorker> => {
return client.getLanguageServiceWorker(...uris);
};
@ -25,19 +23,13 @@ export function setupMode1(defaults: LanguageServiceDefaults): void {
languageId,
new languageFeatures.CompletionAdapter(worker)
);
languages.registerHoverProvider(
languageId,
new languageFeatures.HoverAdapter(worker)
);
languages.registerHoverProvider(languageId, new languageFeatures.HoverAdapter(worker));
languages.registerDocumentHighlightProvider(
languageId,
new languageFeatures.DocumentHighlightAdapter(worker)
);
languages.registerLinkProvider(
languageId,
new languageFeatures.DocumentLinkAdapter(worker)
);
languages.registerLinkProvider(languageId, new languageFeatures.DocumentLinkAdapter(worker));
languages.registerFoldingRangeProvider(
languageId,
new languageFeatures.FoldingRangeAdapter(worker)
@ -50,10 +42,7 @@ export function setupMode1(defaults: LanguageServiceDefaults): void {
languageId,
new languageFeatures.SelectionRangeAdapter(worker)
);
languages.registerRenameProvider(
languageId,
new languageFeatures.RenameAdapter(worker)
);
languages.registerRenameProvider(languageId, new languageFeatures.RenameAdapter(worker));
// only html
if (languageId === 'html') {
@ -76,9 +65,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
const client = new WorkerManager(defaults);
disposables.push(client);
const worker: languageFeatures.WorkerAccessor = (
...uris: Uri[]
): Promise<HTMLWorker> => {
const worker: languageFeatures.WorkerAccessor = (...uris: Uri[]): Promise<HTMLWorker> => {
return client.getLanguageServiceWorker(...uris);
};
@ -97,10 +84,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
}
if (modeConfiguration.hovers) {
providers.push(
languages.registerHoverProvider(
languageId,
new languageFeatures.HoverAdapter(worker)
)
languages.registerHoverProvider(languageId, new languageFeatures.HoverAdapter(worker))
);
}
if (modeConfiguration.documentHighlights) {
@ -113,10 +97,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
}
if (modeConfiguration.links) {
providers.push(
languages.registerLinkProvider(
languageId,
new languageFeatures.DocumentLinkAdapter(worker)
)
languages.registerLinkProvider(languageId, new languageFeatures.DocumentLinkAdapter(worker))
);
}
if (modeConfiguration.documentSymbols) {
@ -129,10 +110,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
}
if (modeConfiguration.rename) {
providers.push(
languages.registerRenameProvider(
languageId,
new languageFeatures.RenameAdapter(worker)
)
languages.registerRenameProvider(languageId, new languageFeatures.RenameAdapter(worker))
);
}
if (modeConfiguration.foldingRanges) {
@ -168,9 +146,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
);
}
if (modeConfiguration.diagnostics) {
providers.push(
new languageFeatures.DiagnosticsAdapter(languageId, worker, defaults)
);
providers.push(new languageFeatures.DiagnosticsAdapter(languageId, worker, defaults));
}
}

32
src/htmlWorker.ts
View file

@ -52,10 +52,7 @@ export class HTMLWorker {
);
return Promise.resolve(textEdits);
}
async doHover(
uri: string,
position: htmlService.Position
): Promise<htmlService.Hover> {
async doHover(uri: string, position: htmlService.Position): Promise<htmlService.Hover> {
let document = this._getTextDocument(uri);
let htmlDocument = this._languageService.parseHTMLDocument(document);
let hover = this._languageService.doHover(document, position, htmlDocument);
@ -67,11 +64,7 @@ export class HTMLWorker {
): Promise<htmlService.DocumentHighlight[]> {
let document = this._getTextDocument(uri);
let htmlDocument = this._languageService.parseHTMLDocument(document);
let highlights = this._languageService.findDocumentHighlights(
document,
position,
htmlDocument
);
let highlights = this._languageService.findDocumentHighlights(document, position, htmlDocument);
return Promise.resolve(highlights);
}
async findDocumentLinks(uri: string): Promise<htmlService.DocumentLink[]> {
@ -79,15 +72,10 @@ export class HTMLWorker {
let links = this._languageService.findDocumentLinks(document, null);
return Promise.resolve(links);
}
async findDocumentSymbols(
uri: string
): Promise<htmlService.SymbolInformation[]> {
async findDocumentSymbols(uri: string): Promise<htmlService.SymbolInformation[]> {
let document = this._getTextDocument(uri);
let htmlDocument = this._languageService.parseHTMLDocument(document);
let symbols = this._languageService.findDocumentSymbols(
document,
htmlDocument
);
let symbols = this._languageService.findDocumentSymbols(document, htmlDocument);
return Promise.resolve(symbols);
}
async getFoldingRanges(
@ -113,12 +101,7 @@ export class HTMLWorker {
): Promise<htmlService.WorkspaceEdit> {
let document = this._getTextDocument(uri);
let htmlDocument = this._languageService.parseHTMLDocument(document);
let renames = this._languageService.doRename(
document,
position,
newName,
htmlDocument
);
let renames = this._languageService.doRename(document, position, newName, htmlDocument);
return Promise.resolve(renames);
}
private _getTextDocument(uri: string): htmlService.TextDocument {
@ -142,9 +125,6 @@ export interface ICreateData {
languageSettings: Options;
}
export function create(
ctx: worker.IWorkerContext,
createData: ICreateData
): HTMLWorker {
export function create(ctx: worker.IWorkerContext, createData: ICreateData): HTMLWorker {
return new HTMLWorker(ctx, createData);
}

82
src/languageFeatures.ts
View file

@ -104,11 +104,7 @@ export class DiagnosticsAdapter {
.then((worker) => {
return worker.doValidation(resource.toString()).then((diagnostics) => {
const markers = diagnostics.map((d) => toDiagnostics(resource, d));
editor.setModelMarkers(
editor.getModel(resource),
languageId,
markers
);
editor.setModelMarkers(editor.getModel(resource), languageId, markers);
});
})
.then(undefined, (err) => {
@ -132,12 +128,8 @@ function toSeverity(lsSeverity: number): MarkerSeverity {
}
}
function toDiagnostics(
resource: Uri,
diag: htmlService.Diagnostic
): editor.IMarkerData {
const code =
typeof diag.code === 'number' ? String(diag.code) : <string>diag.code;
function toDiagnostics(resource: Uri, diag: htmlService.Diagnostic): editor.IMarkerData {
const code = typeof diag.code === 'number' ? String(diag.code) : <string>diag.code;
return {
severity: toSeverity(diag.severity),
@ -182,9 +174,7 @@ function toRange(range: htmlService.Range): Range {
);
}
function isInsertReplaceEdit(
edit: TextEdit | InsertReplaceEdit
): edit is InsertReplaceEdit {
function isInsertReplaceEdit(edit: TextEdit | InsertReplaceEdit): edit is InsertReplaceEdit {
return (
typeof (<InsertReplaceEdit>edit).insert !== 'undefined' &&
typeof (<InsertReplaceEdit>edit).replace !== 'undefined'
@ -281,9 +271,7 @@ function fromCompletionItemKind(
return htmlService.CompletionItemKind.Property;
}
function toTextEdit(
textEdit: htmlService.TextEdit
): editor.ISingleEditOperation {
function toTextEdit(textEdit: htmlService.TextEdit): editor.ISingleEditOperation {
if (!textEdit) {
return void 0;
}
@ -347,13 +335,10 @@ export class CompletionAdapter implements languages.CompletionItemProvider {
item.insertText = entry.textEdit.newText;
}
if (entry.additionalTextEdits) {
item.additionalTextEdits = entry.additionalTextEdits.map(
toTextEdit
);
item.additionalTextEdits = entry.additionalTextEdits.map(toTextEdit);
}
if (entry.insertTextFormat === htmlService.InsertTextFormat.Snippet) {
item.insertTextRules =
languages.CompletionItemInsertTextRule.InsertAsSnippet;
item.insertTextRules = languages.CompletionItemInsertTextRule.InsertAsSnippet;
}
return item;
});
@ -399,10 +384,7 @@ function toMarkdownString(
}
function toMarkedStringArray(
contents:
| htmlService.MarkupContent
| htmlService.MarkedString
| htmlService.MarkedString[]
contents: htmlService.MarkupContent | htmlService.MarkedString | htmlService.MarkedString[]
): IMarkdownString[] {
if (!contents) {
return void 0;
@ -441,9 +423,7 @@ export class HoverAdapter implements languages.HoverProvider {
// --- document highlights ------
function toHighlighKind(
kind: htmlService.DocumentHighlightKind
): languages.DocumentHighlightKind {
function toHighlighKind(kind: htmlService.DocumentHighlightKind): languages.DocumentHighlightKind {
const mKind = languages.DocumentHighlightKind;
switch (kind) {
@ -457,8 +437,7 @@ function toHighlighKind(
return mKind.Text;
}
export class DocumentHighlightAdapter
implements languages.DocumentHighlightProvider {
export class DocumentHighlightAdapter implements languages.DocumentHighlightProvider {
constructor(private _worker: WorkerAccessor) {}
public provideDocumentHighlights(
@ -469,12 +448,7 @@ export class DocumentHighlightAdapter
const resource = model.uri;
return this._worker(resource)
.then((worker) =>
worker.findDocumentHighlights(
resource.toString(),
fromPosition(position)
)
)
.then((worker) => worker.findDocumentHighlights(resource.toString(), fromPosition(position)))
.then((items) => {
if (!items) {
return;
@ -595,8 +569,7 @@ function fromFormattingOptions(
};
}
export class DocumentFormattingEditProvider
implements languages.DocumentFormattingEditProvider {
export class DocumentFormattingEditProvider implements languages.DocumentFormattingEditProvider {
constructor(private _worker: WorkerAccessor) {}
public provideDocumentFormattingEdits(
@ -633,11 +606,7 @@ export class DocumentRangeFormattingEditProvider
return this._worker(resource).then((worker) => {
return worker
.format(
resource.toString(),
fromRange(range),
fromFormattingOptions(options)
)
.format(resource.toString(), fromRange(range), fromFormattingOptions(options))
.then((edits) => {
if (!edits || edits.length === 0) {
return;
@ -661,11 +630,7 @@ export class RenameAdapter implements languages.RenameProvider {
return this._worker(resource)
.then((worker) => {
return worker.doRename(
resource.toString(),
fromPosition(position),
newName
);
return worker.doRename(resource.toString(), fromPosition(position), newName);
})
.then((edit) => {
return toWorkspaceEdit(edit);
@ -673,9 +638,7 @@ export class RenameAdapter implements languages.RenameProvider {
}
}
function toWorkspaceEdit(
edit: htmlService.WorkspaceEdit
): languages.WorkspaceEdit {
function toWorkspaceEdit(edit: htmlService.WorkspaceEdit): languages.WorkspaceEdit {
if (!edit || !edit.changes) {
return void 0;
}
@ -719,9 +682,7 @@ export class FoldingRangeAdapter implements languages.FoldingRangeProvider {
end: range.endLine + 1
};
if (typeof range.kind !== 'undefined') {
result.kind = toFoldingRangeKind(
<htmlService.FoldingRangeKind>range.kind
);
result.kind = toFoldingRangeKind(<htmlService.FoldingRangeKind>range.kind);
}
return result;
});
@ -729,9 +690,7 @@ export class FoldingRangeAdapter implements languages.FoldingRangeProvider {
}
}
function toFoldingRangeKind(
kind: htmlService.FoldingRangeKind
): languages.FoldingRangeKind {
function toFoldingRangeKind(kind: htmlService.FoldingRangeKind): languages.FoldingRangeKind {
switch (kind) {
case htmlService.FoldingRangeKind.Comment:
return languages.FoldingRangeKind.Comment;
@ -753,12 +712,7 @@ export class SelectionRangeAdapter implements languages.SelectionRangeProvider {
const resource = model.uri;
return this._worker(resource)
.then((worker) =>
worker.getSelectionRanges(
resource.toString(),
positions.map(fromPosition)
)
)
.then((worker) => worker.getSelectionRanges(resource.toString(), positions.map(fromPosition)))
.then((selectionRanges) => {
if (!selectionRanges) {
return;

16
src/monaco.contribution.ts
View file

@ -18,11 +18,7 @@ export interface HTMLFormatConfiguration {
readonly indentHandlebars: boolean;
readonly endWithNewline: boolean;
readonly extraLiners: string;
readonly wrapAttributes:
| 'auto'
| 'force'
| 'force-aligned'
| 'force-expand-multiline';
readonly wrapAttributes: 'auto' | 'force' | 'force-aligned' | 'force-expand-multiline';
}
export interface CompletionConfiguration {
@ -118,11 +114,7 @@ class LanguageServiceDefaultsImpl implements LanguageServiceDefaults {
private _modeConfiguration: ModeConfiguration;
private _languageId: string;
constructor(
languageId: string,
options: Options,
modeConfiguration: ModeConfiguration
) {
constructor(languageId: string, options: Options, modeConfiguration: ModeConfiguration) {
this._languageId = languageId;
this.setOptions(options);
this.setModeConfiguration(modeConfiguration);
@ -186,9 +178,7 @@ const razorOptionsDefault: Required<Options> = {
suggest: { html5: true, razor: true }
};
function getConfigurationDefault(
languageId: string
): Required<ModeConfiguration> {
function getConfigurationDefault(languageId: string): Required<ModeConfiguration> {
return {
completionItems: true,
hovers: true,

8
src/tsconfig.esm.json
View file

@ -5,12 +5,6 @@
"outDir": "../out/esm",
"declaration": true,
"target": "es5",
"lib": [
"dom",
"es5",
"es2015.collection",
"es2015.promise",
"es2015.iterable"
]
"lib": ["dom", "es5", "es2015.collection", "es2015.promise", "es2015.iterable"]
}
}

8
src/tsconfig.json
View file

@ -5,12 +5,6 @@
"outDir": "../out/amd",
"declaration": true,
"target": "es5",
"lib": [
"dom",
"es5",
"es2015.collection",
"es2015.promise",
"es2015.iterable"
]
"lib": ["dom", "es5", "es2015.collection", "es2015.promise", "es2015.iterable"]
}
}

4
src/workerManager.ts
View file

@ -23,9 +23,7 @@ export class WorkerManager {
this._worker = null;
this._idleCheckInterval = setInterval(() => this._checkIfIdle(), 30 * 1000);
this._lastUsedTime = 0;
this._configChangeListener = this._defaults.onDidChange(() =>
this._stopWorker()
);
this._configChangeListener = this._defaults.onDidChange(() => this._stopWorker());
}
private _stopWorker(): void {

12
test/index.html
View file

@ -11,10 +11,7 @@
</head>
<body>
<h2>Monaco Editor HTML test page</h2>
<div
id="container"
style="width: 800px; height: 600px; border: 1px solid grey"
></div>
<div id="container" style="width: 800px; height: 600px; border: 1px solid grey"></div>
<script>
// Loading basic-languages to get the html language definition
@ -44,9 +41,7 @@
'vs/basic-languages/monaco.contribution',
'vs/language/html/monaco.contribution'
], function () {
var editor = monaco.editor.create(
document.getElementById('container'),
{
var editor = monaco.editor.create(document.getElementById('container'), {
value: [
'<!DOCTYPE HTML>',
'<!--',
@ -73,8 +68,7 @@
'</html>'
].join('\n'),
language: 'html'
}
);
});
});
</script>
</body>