diff --git a/extensions/php/src/features/completionItemProvider.ts b/extensions/php/src/features/completionItemProvider.ts index 7977b274aee9ae5d331444959760d62bc3984935..94bd75e4e5cbbc0999af959d23d74d2a9769c530 100644 --- a/extensions/php/src/features/completionItemProvider.ts +++ b/extensions/php/src/features/completionItemProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import {CompletionItemProvider, CompletionItem, CompletionItemKind, CancellationToken, TextDocument, Position, Range, TextEdit} from 'vscode'; +import { CompletionItemProvider, CompletionItem, CompletionItemKind, CancellationToken, TextDocument, Position, Range, TextEdit } from 'vscode'; import phpGlobals = require('./phpGlobals'); export default class PHPCompletionItemProvider implements CompletionItemProvider { @@ -14,19 +14,19 @@ export default class PHPCompletionItemProvider implements CompletionItemProvider public provideCompletionItems(document: TextDocument, position: Position, token: CancellationToken): Promise { let result: CompletionItem[] = []; - var range = document.getWordRangeAtPosition(position); + var range = document.getWordRangeAtPosition(position); var prefix = range ? document.getText(range) : ''; if (!range) { range = new Range(position, position); } - - var added : any = {}; - var createNewProposal = function(kind: CompletionItemKind, name: string, entry: phpGlobals.IEntry) : CompletionItem { - var proposal : CompletionItem = new CompletionItem(name); + + var added: any = {}; + var createNewProposal = function (kind: CompletionItemKind, name: string, entry: phpGlobals.IEntry): CompletionItem { + var proposal: CompletionItem = new CompletionItem(name); proposal.kind = kind; if (entry) { if (entry.description) { - proposal.documentation= entry.description; + proposal.documentation = entry.description; } if (entry.signature) { proposal.detail = entry.signature; @@ -35,14 +35,14 @@ export default class PHPCompletionItemProvider implements CompletionItemProvider return proposal; }; - var matches = (name:string) => { + var matches = (name: string) => { return prefix.length === 0 || name.length >= prefix.length && name.substr(0, prefix.length) === prefix; }; - + if (matches('php') && range.start.character >= 2) { let twoBeforePosition = new Position(range.start.line, range.start.character - 2); let beforeWord = document.getText(new Range(twoBeforePosition, range.start)); - + if (beforeWord === '= 0; } - public next() : number { + public next(): number { if (this.offset < 0) { if (this.lineNumber > 0) { this.lineNumber--; @@ -92,7 +92,7 @@ export default class PHPSignatureHelpProvider implements SignatureHelpProvider { var re = /\w*\s+\&?\$[\w_\.]+|void/g; var match: RegExpExecArray = null; while ((match = re.exec(paramsString)) !== null) { - signatureInfo.parameters.push({ label: match[0], documentation: ''}); + signatureInfo.parameters.push({ label: match[0], documentation: '' }); } let ret = new SignatureHelp(); ret.signatures.push(signatureInfo); @@ -101,7 +101,7 @@ export default class PHPSignatureHelpProvider implements SignatureHelpProvider { return Promise.resolve(ret); } - private readArguments(iterator: BackwardIterator) : number { + private readArguments(iterator: BackwardIterator): number { var parentNesting = 0; var bracketNesting = 0; var curlyNesting = 0; @@ -136,8 +136,8 @@ export default class PHPSignatureHelpProvider implements SignatureHelpProvider { return -1; } - private isIdentPart(ch:number) : boolean { - if(ch === _USC || // _ + private isIdentPart(ch: number): boolean { + if (ch === _USC || // _ ch >= _a && ch <= _z || // a-z ch >= _A && ch <= _Z || // A-Z ch >= _0 && ch <= _9 || // 0/9 @@ -148,7 +148,7 @@ export default class PHPSignatureHelpProvider implements SignatureHelpProvider { return false; } - private readIdent(iterator: BackwardIterator) : string { + private readIdent(iterator: BackwardIterator): string { var identStarted = false; var ident = ''; while (iterator.hasNext()) { @@ -158,7 +158,7 @@ export default class PHPSignatureHelpProvider implements SignatureHelpProvider { } if (this.isIdentPart(ch)) { identStarted = true; - ident= String.fromCharCode(ch) + ident; + ident = String.fromCharCode(ch) + ident; } else if (identStarted) { return ident; } diff --git a/extensions/php/src/features/utils/markedTextUtil.ts b/extensions/php/src/features/utils/markedTextUtil.ts index 97f3198b80cd9d90d64d3afa6bad706686275c41..b4a9aaaf3e9ac0f3ce3fdbf5986eb155a4f6d09d 100644 --- a/extensions/php/src/features/utils/markedTextUtil.ts +++ b/extensions/php/src/features/utils/markedTextUtil.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {MarkedString} from 'vscode'; +import { MarkedString } from 'vscode'; -export function textToMarkedString(text: string) : MarkedString { +export function textToMarkedString(text: string): MarkedString { return text.replace(/[\\`*_{}[\]()#+\-.!]/g, '\\$&'); // escape markdown syntax tokens: http://daringfireball.net/projects/markdown/syntax#backslash } \ No newline at end of file diff --git a/extensions/php/src/features/validationProvider.ts b/extensions/php/src/features/validationProvider.ts index aea88a0b2b32457c7bdfbe80c053ca11faf19fd7..911b4448d384bce22c3285b3f8ac942438418596 100644 --- a/extensions/php/src/features/validationProvider.ts +++ b/extensions/php/src/features/validationProvider.ts @@ -70,7 +70,7 @@ namespace RunTrigger { onSave: 'onSave', onType: 'onType' }; - export let from = function(value: string): RunTrigger { + export let from = function (value: string): RunTrigger { if (value === 'onType') { return RunTrigger.onType; } else { @@ -108,7 +108,7 @@ export default class PHPValidationProvider { this.loadConfiguration(); vscode.workspace.onDidOpenTextDocument(this.triggerValidate, this, subscriptions); - vscode.workspace.onDidCloseTextDocument((textDocument)=> { + vscode.workspace.onDidCloseTextDocument((textDocument) => { this.diagnosticCollection.delete(textDocument.uri); delete this.delayers[textDocument.uri.toString()]; }, null, subscriptions); @@ -158,7 +158,7 @@ export default class PHPValidationProvider { delayer = new ThrottledDelayer(this.trigger === RunTrigger.onType ? 250 : 0); this.delayers[key] = delayer; } - delayer.trigger(() => this.doValidate(textDocument) ); + delayer.trigger(() => this.doValidate(textDocument)); } private doValidate(textDocument: vscode.TextDocument): Promise { diff --git a/extensions/php/src/phpMain.ts b/extensions/php/src/phpMain.ts index 3cb964d1e02986e5c5936c98541fb36248eac3d9..4ebc68e31da63868d7b9da1a14ec86c9acf6c4f9 100644 --- a/extensions/php/src/phpMain.ts +++ b/extensions/php/src/phpMain.ts @@ -14,7 +14,7 @@ import { ExtensionContext, languages, env } from 'vscode'; import * as nls from 'vscode-nls'; export function activate(context: ExtensionContext): any { - nls.config({locale: env.language}); + nls.config({ locale: env.language }); // add providers context.subscriptions.push(languages.registerCompletionItemProvider('php', new PHPCompletionItemProvider(), '.', '$')); diff --git a/extensions/php/typings/mocha.d.ts b/extensions/php/typings/mocha.d.ts index 7b23f5d18164203f2c65ac897250e2b070dc9566..f677473dcdd76f32f6bcf36d2754b8d144578c1d 100644 --- a/extensions/php/typings/mocha.d.ts +++ b/extensions/php/typings/mocha.d.ts @@ -5,9 +5,9 @@ declare function run(): void; -declare function suite(name: string, fn: (err?)=>void); -declare function test(name: string, fn: (done?: (err?)=>void)=>void); -declare function suiteSetup(fn: (done?: (err?)=>void)=>void); -declare function suiteTeardown(fn: (done?: (err?)=>void)=>void); -declare function setup(fn: (done?: (err?)=>void)=>void); -declare function teardown(fn: (done?: (err?)=>void)=>void); +declare function suite(name: string, fn: (err?) => void); +declare function test(name: string, fn: (done?: (err?) => void) => void); +declare function suiteSetup(fn: (done?: (err?) => void) => void); +declare function suiteTeardown(fn: (done?: (err?) => void) => void); +declare function setup(fn: (done?: (err?) => void) => void); +declare function teardown(fn: (done?: (err?) => void) => void);