From 44cb53cd6e4e6762de141511660f98e20ac81adc Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 8 Aug 2018 15:51:09 +0200 Subject: [PATCH] Format --- src/languageFeatures.ts | 12 ++++++------ src/tokenization.ts | 28 ++++++++++++++-------------- src/tsMode.ts | 16 ++++++++-------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts index 71ca4230..35546fc3 100644 --- a/src/languageFeatures.ts +++ b/src/languageFeatures.ts @@ -34,8 +34,8 @@ export abstract class Adapter { protected _textSpanToRange(uri: Uri, span: ts.TextSpan): monaco.IRange { let p1 = this._offsetToPosition(uri, span.start); let p2 = this._offsetToPosition(uri, span.start + span.length); - let {lineNumber: startLineNumber, column: startColumn} = p1; - let {lineNumber: endLineNumber, column: endColumn} = p2; + let { lineNumber: startLineNumber, column: startColumn } = p1; + let { lineNumber: endLineNumber, column: endColumn } = p2; return { startLineNumber, startColumn, endLineNumber, endColumn }; } } @@ -120,7 +120,7 @@ export class DiagnostcsAdapter extends Adapter { return null; } const promises: Promise[] = []; - const {noSyntaxValidation, noSemanticValidation} = this._defaults.getDiagnosticsOptions(); + const { noSyntaxValidation, noSemanticValidation } = this._defaults.getDiagnosticsOptions(); if (!noSyntaxValidation) { promises.push(worker.getSyntacticDiagnostics(resource.toString())); } @@ -144,8 +144,8 @@ export class DiagnostcsAdapter extends Adapter { } private _convertDiagnostics(resource: Uri, diag: ts.Diagnostic): monaco.editor.IMarkerData { - const {lineNumber: startLineNumber, column: startColumn} = this._offsetToPosition(resource, diag.start); - const {lineNumber: endLineNumber, column: endColumn} = this._offsetToPosition(resource, diag.start + diag.length); + const { lineNumber: startLineNumber, column: startColumn } = this._offsetToPosition(resource, diag.start); + const { lineNumber: endLineNumber, column: endColumn } = this._offsetToPosition(resource, diag.start + diag.length); return { severity: monaco.MarkerSeverity.Error, @@ -325,7 +325,7 @@ export class QuickInfoAdapter extends Adapter implements monaco.languages.HoverP } return label + (tag.text.match(/\r\n|\n/g) ? ' \n' + tag.text : ` - ${tag.text}`); }) - .join(' \n\n') : ''; + .join(' \n\n') : ''; let contents = ts.displayPartsToString(info.displayParts); return { range: this._textSpanToRange(resource, info.textSpan), diff --git a/src/tokenization.ts b/src/tokenization.ts index e8cd4f21..a937b09d 100644 --- a/src/tokenization.ts +++ b/src/tokenization.ts @@ -11,7 +11,7 @@ export enum Language { EcmaScript5 } -export function createTokenizationSupport(language:Language): monaco.languages.TokensProvider { +export function createTokenizationSupport(language: Language): monaco.languages.TokensProvider { var classifier = ts.createClassifier(), bracketTypeTable = language === Language.TypeScript ? tsBracketTypeTable : jsBracketTypeTable, @@ -19,7 +19,7 @@ export function createTokenizationSupport(language:Language): monaco.languages.T return { getInitialState: () => new State(language, ts.EndOfLineState.None, false), - tokenize: (line, state) => tokenize(bracketTypeTable, tokenTypeTable, classifier, state, line) + tokenize: (line, state) => tokenize(bracketTypeTable, tokenTypeTable, classifier, state, line) }; } @@ -29,7 +29,7 @@ class State implements monaco.languages.IState { public eolState: ts.EndOfLineState; public inJsDocComment: boolean; - constructor(language:Language, eolState: ts.EndOfLineState, inJsDocComment: boolean) { + constructor(language: Language, eolState: ts.EndOfLineState, inJsDocComment: boolean) { this.language = language; this.eolState = eolState; this.inJsDocComment = inJsDocComment; @@ -39,17 +39,17 @@ class State implements monaco.languages.IState { return new State(this.language, this.eolState, this.inJsDocComment); } - public equals(other:monaco.languages.IState):boolean { - if(other === this) { + public equals(other: monaco.languages.IState): boolean { + if (other === this) { return true; } - if(!other || !(other instanceof State)) { + if (!other || !(other instanceof State)) { return false; } - if (this.eolState !== ( other).eolState) { + if (this.eolState !== (other).eolState) { return false; } - if(this.inJsDocComment !== ( other).inJsDocComment) { + if (this.inJsDocComment !== (other).inJsDocComment) { return false; } return true; @@ -65,8 +65,8 @@ function tokenize(bracketTypeTable: { [i: number]: string }, tokenTypeTable: { [ endState: new State(state.language, ts.EndOfLineState.None, false) }; - function appendFn(startIndex:number, type:string):void { - if(ret.tokens.length === 0 || ret.tokens[ret.tokens.length - 1].scopes !== type) { + function appendFn(startIndex: number, type: string): void { + if (ret.tokens.length === 0 || ret.tokens[ret.tokens.length - 1].scopes !== type) { ret.tokens.push({ startIndex: startIndex, scopes: type @@ -120,7 +120,7 @@ interface INumberStringDictionary { [idx: number]: string; } -var tsBracketTypeTable:INumberStringDictionary = Object.create(null); +var tsBracketTypeTable: INumberStringDictionary = Object.create(null); tsBracketTypeTable['('.charCodeAt(0)] = 'delimiter.parenthesis.ts'; tsBracketTypeTable[')'.charCodeAt(0)] = 'delimiter.parenthesis.ts'; tsBracketTypeTable['{'.charCodeAt(0)] = 'delimiter.bracket.ts'; @@ -128,7 +128,7 @@ tsBracketTypeTable['}'.charCodeAt(0)] = 'delimiter.bracket.ts'; tsBracketTypeTable['['.charCodeAt(0)] = 'delimiter.array.ts'; tsBracketTypeTable[']'.charCodeAt(0)] = 'delimiter.array.ts'; -var tsTokenTypeTable:INumberStringDictionary = Object.create(null); +var tsTokenTypeTable: INumberStringDictionary = Object.create(null); tsTokenTypeTable[ts.TokenClass.Identifier] = 'identifier.ts'; tsTokenTypeTable[ts.TokenClass.Keyword] = 'keyword.ts'; tsTokenTypeTable[ts.TokenClass.Operator] = 'delimiter.ts'; @@ -137,7 +137,7 @@ tsTokenTypeTable[ts.TokenClass.NumberLiteral] = 'number.ts'; tsTokenTypeTable[ts.TokenClass.RegExpLiteral] = 'regexp.ts'; tsTokenTypeTable[ts.TokenClass.StringLiteral] = 'string.ts'; -var jsBracketTypeTable:INumberStringDictionary = Object.create(null); +var jsBracketTypeTable: INumberStringDictionary = Object.create(null); jsBracketTypeTable['('.charCodeAt(0)] = 'delimiter.parenthesis.js'; jsBracketTypeTable[')'.charCodeAt(0)] = 'delimiter.parenthesis.js'; jsBracketTypeTable['{'.charCodeAt(0)] = 'delimiter.bracket.js'; @@ -145,7 +145,7 @@ jsBracketTypeTable['}'.charCodeAt(0)] = 'delimiter.bracket.js'; jsBracketTypeTable['['.charCodeAt(0)] = 'delimiter.array.js'; jsBracketTypeTable[']'.charCodeAt(0)] = 'delimiter.array.js'; -var jsTokenTypeTable:INumberStringDictionary = Object.create(null); +var jsTokenTypeTable: INumberStringDictionary = Object.create(null); jsTokenTypeTable[ts.TokenClass.Identifier] = 'identifier.js'; jsTokenTypeTable[ts.TokenClass.Keyword] = 'keyword.js'; jsTokenTypeTable[ts.TokenClass.Operator] = 'delimiter.js'; diff --git a/src/tsMode.ts b/src/tsMode.ts index 856ffa98..761d513b 100644 --- a/src/tsMode.ts +++ b/src/tsMode.ts @@ -4,10 +4,10 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {Language, createTokenizationSupport} from './tokenization'; -import {WorkerManager} from './workerManager'; -import {TypeScriptWorker} from './tsWorker'; -import {LanguageServiceDefaultsImpl} from './monaco.contribution'; +import { Language, createTokenizationSupport } from './tokenization'; +import { WorkerManager } from './workerManager'; +import { TypeScriptWorker } from './tsWorker'; +import { LanguageServiceDefaultsImpl } from './monaco.contribution'; import * as languageFeatures from './languageFeatures'; import Promise = monaco.Promise; @@ -16,7 +16,7 @@ import Uri = monaco.Uri; let javaScriptWorker: (first: Uri, ...more: Uri[]) => Promise; let typeScriptWorker: (first: Uri, ...more: Uri[]) => Promise; -export function setupTypeScript(defaults:LanguageServiceDefaultsImpl): void { +export function setupTypeScript(defaults: LanguageServiceDefaultsImpl): void { typeScriptWorker = setupMode( defaults, 'typescript', @@ -24,7 +24,7 @@ export function setupTypeScript(defaults:LanguageServiceDefaultsImpl): void { ); } -export function setupJavaScript(defaults:LanguageServiceDefaultsImpl): void { +export function setupJavaScript(defaults: LanguageServiceDefaultsImpl): void { javaScriptWorker = setupMode( defaults, 'javascript', @@ -52,7 +52,7 @@ export function getTypeScriptWorker(): Promise<(first: Uri, ...more: Uri[]) => P }); } -function setupMode(defaults:LanguageServiceDefaultsImpl, modeId:string, language:Language): (first: Uri, ...more: Uri[]) => Promise { +function setupMode(defaults: LanguageServiceDefaultsImpl, modeId: string, language: Language): (first: Uri, ...more: Uri[]) => Promise { const client = new WorkerManager(modeId, defaults); const worker = (first: Uri, ...more: Uri[]): Promise => { @@ -75,7 +75,7 @@ function setupMode(defaults:LanguageServiceDefaultsImpl, modeId:string, language return worker; } -const richEditConfiguration:monaco.languages.LanguageConfiguration = { +const richEditConfiguration: monaco.languages.LanguageConfiguration = { wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g, comments: {