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

Format

Browse source
This commit is contained in:
Alex Dima 2018-08-08 15:51:09 +02:00
parent 201fa54695
commit 44cb53cd6e
3 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/languageFeatures.ts
View file

@ -34,8 +34,8 @@ export abstract class Adapter {
protected _textSpanToRange(uri: Uri, span: ts.TextSpan): monaco.IRange { protected _textSpanToRange(uri: Uri, span: ts.TextSpan): monaco.IRange {
let p1 = this._offsetToPosition(uri, span.start); let p1 = this._offsetToPosition(uri, span.start);
let p2 = this._offsetToPosition(uri, span.start + span.length); let p2 = this._offsetToPosition(uri, span.start + span.length);
let {lineNumber: startLineNumber, column: startColumn} = p1; let { lineNumber: startLineNumber, column: startColumn } = p1;
let {lineNumber: endLineNumber, column: endColumn} = p2; let { lineNumber: endLineNumber, column: endColumn } = p2;
return { startLineNumber, startColumn, endLineNumber, endColumn }; return { startLineNumber, startColumn, endLineNumber, endColumn };
} }
} }
@ -120,7 +120,7 @@ export class DiagnostcsAdapter extends Adapter {
return null; return null;
} }
const promises: Promise<ts.Diagnostic[]>[] = []; const promises: Promise<ts.Diagnostic[]>[] = [];
const {noSyntaxValidation, noSemanticValidation} = this._defaults.getDiagnosticsOptions(); const { noSyntaxValidation, noSemanticValidation } = this._defaults.getDiagnosticsOptions();
if (!noSyntaxValidation) { if (!noSyntaxValidation) {
promises.push(worker.getSyntacticDiagnostics(resource.toString())); 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 { private _convertDiagnostics(resource: Uri, diag: ts.Diagnostic): monaco.editor.IMarkerData {
const {lineNumber: startLineNumber, column: startColumn} = this._offsetToPosition(resource, diag.start); const { lineNumber: startLineNumber, column: startColumn } = this._offsetToPosition(resource, diag.start);
const {lineNumber: endLineNumber, column: endColumn} = this._offsetToPosition(resource, diag.start + diag.length); const { lineNumber: endLineNumber, column: endColumn } = this._offsetToPosition(resource, diag.start + diag.length);
return { return {
severity: monaco.MarkerSeverity.Error, severity: monaco.MarkerSeverity.Error,

28
src/tokenization.ts
View file

@ -11,7 +11,7 @@ export enum Language {
EcmaScript5 EcmaScript5
} }
export function createTokenizationSupport(language:Language): monaco.languages.TokensProvider { export function createTokenizationSupport(language: Language): monaco.languages.TokensProvider {
var classifier = ts.createClassifier(), var classifier = ts.createClassifier(),
bracketTypeTable = language === Language.TypeScript ? tsBracketTypeTable : jsBracketTypeTable, bracketTypeTable = language === Language.TypeScript ? tsBracketTypeTable : jsBracketTypeTable,
@ -19,7 +19,7 @@ export function createTokenizationSupport(language:Language): monaco.languages.T
return { return {
getInitialState: () => new State(language, ts.EndOfLineState.None, false), getInitialState: () => new State(language, ts.EndOfLineState.None, false),
tokenize: (line, state) => tokenize(bracketTypeTable, tokenTypeTable, classifier, <State> state, line) tokenize: (line, state) => tokenize(bracketTypeTable, tokenTypeTable, classifier, <State>state, line)
}; };
} }
@ -29,7 +29,7 @@ class State implements monaco.languages.IState {
public eolState: ts.EndOfLineState; public eolState: ts.EndOfLineState;
public inJsDocComment: boolean; public inJsDocComment: boolean;
constructor(language:Language, eolState: ts.EndOfLineState, inJsDocComment: boolean) { constructor(language: Language, eolState: ts.EndOfLineState, inJsDocComment: boolean) {
this.language = language; this.language = language;
this.eolState = eolState; this.eolState = eolState;
this.inJsDocComment = inJsDocComment; this.inJsDocComment = inJsDocComment;
@ -39,17 +39,17 @@ class State implements monaco.languages.IState {
return new State(this.language, this.eolState, this.inJsDocComment); return new State(this.language, this.eolState, this.inJsDocComment);
} }
public equals(other:monaco.languages.IState):boolean { public equals(other: monaco.languages.IState): boolean {
if(other === this) { if (other === this) {
return true; return true;
} }
if(!other || !(other instanceof State)) { if (!other || !(other instanceof State)) {
return false; return false;
} }
if (this.eolState !== (<State> other).eolState) { if (this.eolState !== (<State>other).eolState) {
return false; return false;
} }
if(this.inJsDocComment !== (<State> other).inJsDocComment) { if (this.inJsDocComment !== (<State>other).inJsDocComment) {
return false; return false;
} }
return true; return true;
@ -65,8 +65,8 @@ function tokenize(bracketTypeTable: { [i: number]: string }, tokenTypeTable: { [
endState: new State(state.language, ts.EndOfLineState.None, false) endState: new State(state.language, ts.EndOfLineState.None, false)
}; };
function appendFn(startIndex:number, type:string):void { function appendFn(startIndex: number, type: string): void {
if(ret.tokens.length === 0 || ret.tokens[ret.tokens.length - 1].scopes !== type) { if (ret.tokens.length === 0 || ret.tokens[ret.tokens.length - 1].scopes !== type) {
ret.tokens.push({ ret.tokens.push({
startIndex: startIndex, startIndex: startIndex,
scopes: type scopes: type
@ -120,7 +120,7 @@ interface INumberStringDictionary {
[idx: number]: string; [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.parenthesis.ts'; tsBracketTypeTable[')'.charCodeAt(0)] = 'delimiter.parenthesis.ts';
tsBracketTypeTable['{'.charCodeAt(0)] = 'delimiter.bracket.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';
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.Identifier] = 'identifier.ts';
tsTokenTypeTable[ts.TokenClass.Keyword] = 'keyword.ts'; tsTokenTypeTable[ts.TokenClass.Keyword] = 'keyword.ts';
tsTokenTypeTable[ts.TokenClass.Operator] = 'delimiter.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.RegExpLiteral] = 'regexp.ts';
tsTokenTypeTable[ts.TokenClass.StringLiteral] = 'string.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.parenthesis.js'; jsBracketTypeTable[')'.charCodeAt(0)] = 'delimiter.parenthesis.js';
jsBracketTypeTable['{'.charCodeAt(0)] = 'delimiter.bracket.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';
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.Identifier] = 'identifier.js';
jsTokenTypeTable[ts.TokenClass.Keyword] = 'keyword.js'; jsTokenTypeTable[ts.TokenClass.Keyword] = 'keyword.js';
jsTokenTypeTable[ts.TokenClass.Operator] = 'delimiter.js'; jsTokenTypeTable[ts.TokenClass.Operator] = 'delimiter.js';

16
src/tsMode.ts
View file

@ -4,10 +4,10 @@
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
'use strict'; 'use strict';
import {Language, createTokenizationSupport} from './tokenization'; import { Language, createTokenizationSupport } from './tokenization';
import {WorkerManager} from './workerManager'; import { WorkerManager } from './workerManager';
import {TypeScriptWorker} from './tsWorker'; import { TypeScriptWorker } from './tsWorker';
import {LanguageServiceDefaultsImpl} from './monaco.contribution'; import { LanguageServiceDefaultsImpl } from './monaco.contribution';
import * as languageFeatures from './languageFeatures'; import * as languageFeatures from './languageFeatures';
import Promise = monaco.Promise; import Promise = monaco.Promise;
@ -16,7 +16,7 @@ import Uri = monaco.Uri;
let javaScriptWorker: (first: Uri, ...more: Uri[]) => Promise<TypeScriptWorker>; let javaScriptWorker: (first: Uri, ...more: Uri[]) => Promise<TypeScriptWorker>;
let typeScriptWorker: (first: Uri, ...more: Uri[]) => Promise<TypeScriptWorker>; let typeScriptWorker: (first: Uri, ...more: Uri[]) => Promise<TypeScriptWorker>;
export function setupTypeScript(defaults:LanguageServiceDefaultsImpl): void { export function setupTypeScript(defaults: LanguageServiceDefaultsImpl): void {
typeScriptWorker = setupMode( typeScriptWorker = setupMode(
defaults, defaults,
'typescript', '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( javaScriptWorker = setupMode(
defaults, defaults,
'javascript', '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<TypeScriptWorker> { function setupMode(defaults: LanguageServiceDefaultsImpl, modeId: string, language: Language): (first: Uri, ...more: Uri[]) => Promise<TypeScriptWorker> {
const client = new WorkerManager(modeId, defaults); const client = new WorkerManager(modeId, defaults);
const worker = (first: Uri, ...more: Uri[]): Promise<TypeScriptWorker> => { const worker = (first: Uri, ...more: Uri[]): Promise<TypeScriptWorker> => {
@ -75,7 +75,7 @@ function setupMode(defaults:LanguageServiceDefaultsImpl, modeId:string, language
return worker; return worker;
} }
const richEditConfiguration:monaco.languages.LanguageConfiguration = { const richEditConfiguration: monaco.languages.LanguageConfiguration = {
wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g, wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,
comments: { comments: {