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:42:59 +02:00
parent 8cc4272694
commit 966506278e
No known key found for this signature in database
GPG key ID: 6E58D7B045760DA0
10 changed files with 885 additions and 1046 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.prettierrc
View file

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

25
scripts/bundle.js
View file

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

18
src/cssMode.ts
View file

@ -16,9 +16,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
const client = new WorkerManager(defaults); const client = new WorkerManager(defaults);
disposables.push(client); disposables.push(client);
const worker: languageFeatures.WorkerAccessor = ( const worker: languageFeatures.WorkerAccessor = (...uris: Uri[]): Promise<CSSWorker> => {
...uris: Uri[]
): Promise<CSSWorker> => {
return client.getLanguageServiceWorker(...uris); return client.getLanguageServiceWorker(...uris);
}; };
@ -37,10 +35,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
} }
if (modeConfiguration.hovers) { if (modeConfiguration.hovers) {
providers.push( providers.push(
languages.registerHoverProvider( languages.registerHoverProvider(languageId, new languageFeatures.HoverAdapter(worker))
languageId,
new languageFeatures.HoverAdapter(worker)
)
); );
} }
if (modeConfiguration.documentHighlights) { if (modeConfiguration.documentHighlights) {
@ -77,10 +72,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
} }
if (modeConfiguration.rename) { if (modeConfiguration.rename) {
providers.push( providers.push(
languages.registerRenameProvider( languages.registerRenameProvider(languageId, new languageFeatures.RenameAdapter(worker))
languageId,
new languageFeatures.RenameAdapter(worker)
)
); );
} }
if (modeConfiguration.colors) { if (modeConfiguration.colors) {
@ -100,9 +92,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
); );
} }
if (modeConfiguration.diagnostics) { if (modeConfiguration.diagnostics) {
providers.push( providers.push(new languageFeatures.DiagnosticsAdapter(languageId, worker, defaults));
new languageFeatures.DiagnosticsAdapter(languageId, worker, defaults)
);
} }
if (modeConfiguration.selectionRanges) { if (modeConfiguration.selectionRanges) {
providers.push( providers.push(

92
src/cssWorker.ts
View file

@ -40,60 +40,33 @@ export class CSSWorker {
let document = this._getTextDocument(uri); let document = this._getTextDocument(uri);
if (document) { if (document) {
let stylesheet = this._languageService.parseStylesheet(document); let stylesheet = this._languageService.parseStylesheet(document);
let diagnostics = this._languageService.doValidation( let diagnostics = this._languageService.doValidation(document, stylesheet);
document,
stylesheet
);
return Promise.resolve(diagnostics); return Promise.resolve(diagnostics);
} }
return Promise.resolve([]); return Promise.resolve([]);
} }
async doComplete( async doComplete(uri: string, position: cssService.Position): Promise<cssService.CompletionList> {
uri: string,
position: cssService.Position
): Promise<cssService.CompletionList> {
let document = this._getTextDocument(uri); let document = this._getTextDocument(uri);
let stylesheet = this._languageService.parseStylesheet(document); let stylesheet = this._languageService.parseStylesheet(document);
let completions = this._languageService.doComplete( let completions = this._languageService.doComplete(document, position, stylesheet);
document,
position,
stylesheet
);
return Promise.resolve(completions); return Promise.resolve(completions);
} }
async doHover( async doHover(uri: string, position: cssService.Position): Promise<cssService.Hover> {
uri: string,
position: cssService.Position
): Promise<cssService.Hover> {
let document = this._getTextDocument(uri); let document = this._getTextDocument(uri);
let stylesheet = this._languageService.parseStylesheet(document); let stylesheet = this._languageService.parseStylesheet(document);
let hover = this._languageService.doHover(document, position, stylesheet); let hover = this._languageService.doHover(document, position, stylesheet);
return Promise.resolve(hover); return Promise.resolve(hover);
} }
async findDefinition( async findDefinition(uri: string, position: cssService.Position): Promise<cssService.Location> {
uri: string,
position: cssService.Position
): Promise<cssService.Location> {
let document = this._getTextDocument(uri); let document = this._getTextDocument(uri);
let stylesheet = this._languageService.parseStylesheet(document); let stylesheet = this._languageService.parseStylesheet(document);
let definition = this._languageService.findDefinition( let definition = this._languageService.findDefinition(document, position, stylesheet);
document,
position,
stylesheet
);
return Promise.resolve(definition); return Promise.resolve(definition);
} }
async findReferences( async findReferences(uri: string, position: cssService.Position): Promise<cssService.Location[]> {
uri: string,
position: cssService.Position
): Promise<cssService.Location[]> {
let document = this._getTextDocument(uri); let document = this._getTextDocument(uri);
let stylesheet = this._languageService.parseStylesheet(document); let stylesheet = this._languageService.parseStylesheet(document);
let references = this._languageService.findReferences( let references = this._languageService.findReferences(document, position, stylesheet);
document,
position,
stylesheet
);
return Promise.resolve(references); return Promise.resolve(references);
} }
async findDocumentHighlights( async findDocumentHighlights(
@ -102,22 +75,13 @@ export class CSSWorker {
): Promise<cssService.DocumentHighlight[]> { ): Promise<cssService.DocumentHighlight[]> {
let document = this._getTextDocument(uri); let document = this._getTextDocument(uri);
let stylesheet = this._languageService.parseStylesheet(document); let stylesheet = this._languageService.parseStylesheet(document);
let highlights = this._languageService.findDocumentHighlights( let highlights = this._languageService.findDocumentHighlights(document, position, stylesheet);
document,
position,
stylesheet
);
return Promise.resolve(highlights); return Promise.resolve(highlights);
} }
async findDocumentSymbols( async findDocumentSymbols(uri: string): Promise<cssService.SymbolInformation[]> {
uri: string
): Promise<cssService.SymbolInformation[]> {
let document = this._getTextDocument(uri); let document = this._getTextDocument(uri);
let stylesheet = this._languageService.parseStylesheet(document); let stylesheet = this._languageService.parseStylesheet(document);
let symbols = this._languageService.findDocumentSymbols( let symbols = this._languageService.findDocumentSymbols(document, stylesheet);
document,
stylesheet
);
return Promise.resolve(symbols); return Promise.resolve(symbols);
} }
async doCodeActions( async doCodeActions(
@ -127,23 +91,13 @@ export class CSSWorker {
): Promise<cssService.Command[]> { ): Promise<cssService.Command[]> {
let document = this._getTextDocument(uri); let document = this._getTextDocument(uri);
let stylesheet = this._languageService.parseStylesheet(document); let stylesheet = this._languageService.parseStylesheet(document);
let actions = this._languageService.doCodeActions( let actions = this._languageService.doCodeActions(document, range, context, stylesheet);
document,
range,
context,
stylesheet
);
return Promise.resolve(actions); return Promise.resolve(actions);
} }
async findDocumentColors( async findDocumentColors(uri: string): Promise<cssService.ColorInformation[]> {
uri: string
): Promise<cssService.ColorInformation[]> {
let document = this._getTextDocument(uri); let document = this._getTextDocument(uri);
let stylesheet = this._languageService.parseStylesheet(document); let stylesheet = this._languageService.parseStylesheet(document);
let colorSymbols = this._languageService.findDocumentColors( let colorSymbols = this._languageService.findDocumentColors(document, stylesheet);
document,
stylesheet
);
return Promise.resolve(colorSymbols); return Promise.resolve(colorSymbols);
} }
async getColorPresentations( async getColorPresentations(
@ -175,11 +129,7 @@ export class CSSWorker {
): Promise<cssService.SelectionRange[]> { ): Promise<cssService.SelectionRange[]> {
let document = this._getTextDocument(uri); let document = this._getTextDocument(uri);
let stylesheet = this._languageService.parseStylesheet(document); let stylesheet = this._languageService.parseStylesheet(document);
let ranges = this._languageService.getSelectionRanges( let ranges = this._languageService.getSelectionRanges(document, positions, stylesheet);
document,
positions,
stylesheet
);
return Promise.resolve(ranges); return Promise.resolve(ranges);
} }
async doRename( async doRename(
@ -189,12 +139,7 @@ export class CSSWorker {
): Promise<cssService.WorkspaceEdit> { ): Promise<cssService.WorkspaceEdit> {
let document = this._getTextDocument(uri); let document = this._getTextDocument(uri);
let stylesheet = this._languageService.parseStylesheet(document); let stylesheet = this._languageService.parseStylesheet(document);
let renames = this._languageService.doRename( let renames = this._languageService.doRename(document, position, newName, stylesheet);
document,
position,
newName,
stylesheet
);
return Promise.resolve(renames); return Promise.resolve(renames);
} }
private _getTextDocument(uri: string): cssService.TextDocument { private _getTextDocument(uri: string): cssService.TextDocument {
@ -218,9 +163,6 @@ export interface ICreateData {
languageSettings: cssService.LanguageSettings; languageSettings: cssService.LanguageSettings;
} }
export function create( export function create(ctx: worker.IWorkerContext, createData: ICreateData): CSSWorker {
ctx: worker.IWorkerContext,
createData: ICreateData
): CSSWorker {
return new CSSWorker(ctx, createData); return new CSSWorker(ctx, createData);
} }

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

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

94
src/languageFeatures.ts
View file

@ -44,10 +44,7 @@ export class DiagnosticsAdapter {
let handle: number; let handle: number;
this._listener[model.uri.toString()] = model.onDidChangeContent(() => { this._listener[model.uri.toString()] = model.onDidChangeContent(() => {
window.clearTimeout(handle); window.clearTimeout(handle);
handle = window.setTimeout( handle = window.setTimeout(() => this._doValidate(model.uri, modeId), 500);
() => this._doValidate(model.uri, modeId),
500
);
}); });
this._doValidate(model.uri, modeId); this._doValidate(model.uri, modeId);
@ -131,12 +128,8 @@ function toSeverity(lsSeverity: number): MarkerSeverity {
} }
} }
function toDiagnostics( function toDiagnostics(resource: Uri, diag: cssService.Diagnostic): editor.IMarkerData {
resource: Uri, let code = typeof diag.code === 'number' ? String(diag.code) : <string>diag.code;
diag: cssService.Diagnostic
): editor.IMarkerData {
let code =
typeof diag.code === 'number' ? String(diag.code) : <string>diag.code;
return { return {
severity: toSeverity(diag.severity), severity: toSeverity(diag.severity),
@ -184,9 +177,7 @@ function toRange(range: cssService.Range): Range {
); );
} }
function isInsertReplaceEdit( function isInsertReplaceEdit(edit: TextEdit | InsertReplaceEdit): edit is InsertReplaceEdit {
edit: TextEdit | InsertReplaceEdit
): edit is InsertReplaceEdit {
return ( return (
typeof (<InsertReplaceEdit>edit).insert !== 'undefined' && typeof (<InsertReplaceEdit>edit).insert !== 'undefined' &&
typeof (<InsertReplaceEdit>edit).replace !== 'undefined' typeof (<InsertReplaceEdit>edit).replace !== 'undefined'
@ -237,9 +228,7 @@ function toCompletionItemKind(kind: number): languages.CompletionItemKind {
return mItemKind.Property; return mItemKind.Property;
} }
function toTextEdit( function toTextEdit(textEdit: cssService.TextEdit): editor.ISingleEditOperation {
textEdit: cssService.TextEdit
): editor.ISingleEditOperation {
if (!textEdit) { if (!textEdit) {
return void 0; return void 0;
} }
@ -303,13 +292,10 @@ 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( item.additionalTextEdits = entry.additionalTextEdits.map(toTextEdit);
toTextEdit
);
} }
if (entry.insertTextFormat === cssService.InsertTextFormat.Snippet) { if (entry.insertTextFormat === cssService.InsertTextFormat.Snippet) {
item.insertTextRules = item.insertTextRules = languages.CompletionItemInsertTextRule.InsertAsSnippet;
languages.CompletionItemInsertTextRule.InsertAsSnippet;
} }
return item; return item;
}); });
@ -324,9 +310,7 @@ export class CompletionAdapter implements languages.CompletionItemProvider {
function isMarkupContent(thing: any): thing is cssService.MarkupContent { function isMarkupContent(thing: any): thing is cssService.MarkupContent {
return ( return (
thing && thing && typeof thing === 'object' && typeof (<cssService.MarkupContent>thing).kind === 'string'
typeof thing === 'object' &&
typeof (<cssService.MarkupContent>thing).kind === 'string'
); );
} }
@ -353,10 +337,7 @@ function toMarkdownString(
} }
function toMarkedStringArray( function toMarkedStringArray(
contents: contents: cssService.MarkupContent | cssService.MarkedString | cssService.MarkedString[]
| cssService.MarkupContent
| cssService.MarkedString
| cssService.MarkedString[]
): IMarkdownString[] { ): IMarkdownString[] {
if (!contents) { if (!contents) {
return void 0; return void 0;
@ -397,9 +378,7 @@ export class HoverAdapter implements languages.HoverProvider {
// --- document highlights ------ // --- document highlights ------
function toDocumentHighlightKind( function toDocumentHighlightKind(kind: number): languages.DocumentHighlightKind {
kind: number
): languages.DocumentHighlightKind {
switch (kind) { switch (kind) {
case cssService.DocumentHighlightKind.Read: case cssService.DocumentHighlightKind.Read:
return languages.DocumentHighlightKind.Read; return languages.DocumentHighlightKind.Read;
@ -411,8 +390,7 @@ function toDocumentHighlightKind(
return languages.DocumentHighlightKind.Text; return languages.DocumentHighlightKind.Text;
} }
export class DocumentHighlightAdapter export class DocumentHighlightAdapter implements languages.DocumentHighlightProvider {
implements languages.DocumentHighlightProvider {
constructor(private _worker: WorkerAccessor) {} constructor(private _worker: WorkerAccessor) {}
public provideDocumentHighlights( public provideDocumentHighlights(
@ -424,10 +402,7 @@ export class DocumentHighlightAdapter
return this._worker(resource) return this._worker(resource)
.then((worker) => { .then((worker) => {
return worker.findDocumentHighlights( return worker.findDocumentHighlights(resource.toString(), fromPosition(position));
resource.toString(),
fromPosition(position)
);
}) })
.then((entries) => { .then((entries) => {
if (!entries) { if (!entries) {
@ -464,10 +439,7 @@ export class DefinitionAdapter {
return this._worker(resource) return this._worker(resource)
.then((worker) => { .then((worker) => {
return worker.findDefinition( return worker.findDefinition(resource.toString(), fromPosition(position));
resource.toString(),
fromPosition(position)
);
}) })
.then((definition) => { .then((definition) => {
if (!definition) { if (!definition) {
@ -493,10 +465,7 @@ export class ReferenceAdapter implements languages.ReferenceProvider {
return this._worker(resource) return this._worker(resource)
.then((worker) => { .then((worker) => {
return worker.findReferences( return worker.findReferences(resource.toString(), fromPosition(position));
resource.toString(),
fromPosition(position)
);
}) })
.then((entries) => { .then((entries) => {
if (!entries) { if (!entries) {
@ -509,9 +478,7 @@ export class ReferenceAdapter implements languages.ReferenceProvider {
// --- rename ------ // --- rename ------
function toWorkspaceEdit( function toWorkspaceEdit(edit: cssService.WorkspaceEdit): languages.WorkspaceEdit {
edit: cssService.WorkspaceEdit
): languages.WorkspaceEdit {
if (!edit || !edit.changes) { if (!edit || !edit.changes) {
return void 0; return void 0;
} }
@ -547,11 +514,7 @@ export class RenameAdapter implements languages.RenameProvider {
return this._worker(resource) return this._worker(resource)
.then((worker) => { .then((worker) => {
return worker.doRename( return worker.doRename(resource.toString(), fromPosition(position), newName);
resource.toString(),
fromPosition(position),
newName
);
}) })
.then((edit) => { .then((edit) => {
return toWorkspaceEdit(edit); return toWorkspaceEdit(edit);
@ -664,11 +627,7 @@ export class DocumentColorAdapter implements languages.DocumentColorProvider {
return this._worker(resource) return this._worker(resource)
.then((worker) => .then((worker) =>
worker.getColorPresentations( worker.getColorPresentations(resource.toString(), info.color, fromRange(info.range))
resource.toString(),
info.color,
fromRange(info.range)
)
) )
.then((presentations) => { .then((presentations) => {
if (!presentations) { if (!presentations) {
@ -682,9 +641,7 @@ 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( item.additionalTextEdits = presentation.additionalTextEdits.map(toTextEdit);
toTextEdit
);
} }
return item; return item;
}); });
@ -714,9 +671,7 @@ export class FoldingRangeAdapter implements languages.FoldingRangeProvider {
end: range.endLine + 1 end: range.endLine + 1
}; };
if (typeof range.kind !== 'undefined') { if (typeof range.kind !== 'undefined') {
result.kind = toFoldingRangeKind( result.kind = toFoldingRangeKind(<cssService.FoldingRangeKind>range.kind);
<cssService.FoldingRangeKind>range.kind
);
} }
return result; return result;
}); });
@ -724,9 +679,7 @@ export class FoldingRangeAdapter implements languages.FoldingRangeProvider {
} }
} }
function toFoldingRangeKind( function toFoldingRangeKind(kind: cssService.FoldingRangeKind): languages.FoldingRangeKind {
kind: cssService.FoldingRangeKind
): languages.FoldingRangeKind {
switch (kind) { switch (kind) {
case cssService.FoldingRangeKind.Comment: case cssService.FoldingRangeKind.Comment:
return languages.FoldingRangeKind.Comment; return languages.FoldingRangeKind.Comment;
@ -748,12 +701,7 @@ export class SelectionRangeAdapter implements languages.SelectionRangeProvider {
const resource = model.uri; const resource = model.uri;
return this._worker(resource) return this._worker(resource)
.then((worker) => .then((worker) => worker.getSelectionRanges(resource.toString(), positions.map(fromPosition)))
worker.getSelectionRanges(
resource.toString(),
positions.map(fromPosition)
)
)
.then((selectionRanges) => { .then((selectionRanges) => {
if (!selectionRanges) { if (!selectionRanges) {
return; return;

8
src/tsconfig.esm.json
View file

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

8
src/tsconfig.json
View file

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

9
src/workerManager.ts
View file

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

1668
test/index.html
View file

File diff suppressed because it is too large Load diff