Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 10:38:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enable no-var-keyword tslint rule

Browse Source
This commit is contained in:
Matt Bierner
2019-01-03 18:02:48 -08:00
parent 3f8579f96a
commit 5cc00861fc
42 changed files with 557 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
extensions/php-language-features/src/features/completionItemProvider.ts
View File

@@ -17,8 +17,8 @@ export default class PHPCompletionItemProvider implements CompletionItemProvider
return Promise.resolve(result);
}
var range = document.getWordRangeAtPosition(position);
var prefix = range ? document.getText(range) : '';
let range = document.getWordRangeAtPosition(position);
let prefix = range ? document.getText(range) : '';
if (!range) {
range = new Range(position, position);
}
@@ -31,9 +31,9 @@ export default class PHPCompletionItemProvider implements CompletionItemProvider
}
}
var added: any = {};
var createNewProposal = function (kind: CompletionItemKind, name: string, entry: phpGlobals.IEntry | null): CompletionItem {
var proposal: CompletionItem = new CompletionItem(name);
let added: any = {};
let createNewProposal = function (kind: CompletionItemKind, name: string, entry: phpGlobals.IEntry | null): CompletionItem {
let proposal: CompletionItem = new CompletionItem(name);
proposal.kind = kind;
if (entry) {
if (entry.description) {
@@ -46,7 +46,7 @@ export default class PHPCompletionItemProvider implements CompletionItemProvider
return proposal;
};
var matches = (name: string) => {
let matches = (name: string) => {
return prefix.length === 0 || name.length >= prefix.length && name.substr(0, prefix.length) === prefix;
};
@@ -62,47 +62,47 @@ export default class PHPCompletionItemProvider implements CompletionItemProvider
}
}
for (var globalvariables in phpGlobals.globalvariables) {
for (let globalvariables in phpGlobals.globalvariables) {
if (phpGlobals.globalvariables.hasOwnProperty(globalvariables) && matches(globalvariables)) {
added[globalvariables] = true;
result.push(createNewProposal(CompletionItemKind.Variable, globalvariables, phpGlobals.globalvariables[globalvariables]));
}
}
for (var globalfunctions in phpGlobalFunctions.globalfunctions) {
for (let globalfunctions in phpGlobalFunctions.globalfunctions) {
if (phpGlobalFunctions.globalfunctions.hasOwnProperty(globalfunctions) && matches(globalfunctions)) {
added[globalfunctions] = true;
result.push(createNewProposal(CompletionItemKind.Function, globalfunctions, phpGlobalFunctions.globalfunctions[globalfunctions]));
}
}
for (var compiletimeconstants in phpGlobals.compiletimeconstants) {
for (let compiletimeconstants in phpGlobals.compiletimeconstants) {
if (phpGlobals.compiletimeconstants.hasOwnProperty(compiletimeconstants) && matches(compiletimeconstants)) {
added[compiletimeconstants] = true;
result.push(createNewProposal(CompletionItemKind.Field, compiletimeconstants, phpGlobals.compiletimeconstants[compiletimeconstants]));
}
}
for (var keywords in phpGlobals.keywords) {
for (let keywords in phpGlobals.keywords) {
if (phpGlobals.keywords.hasOwnProperty(keywords) && matches(keywords)) {
added[keywords] = true;
result.push(createNewProposal(CompletionItemKind.Keyword, keywords, phpGlobals.keywords[keywords]));
}
}
var text = document.getText();
let text = document.getText();
if (prefix[0] === '$') {
var variableMatch = /\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)/g;
var match: RegExpExecArray | null = null;
let variableMatch = /\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)/g;
let match: RegExpExecArray | null = null;
while (match = variableMatch.exec(text)) {
var word = match[0];
let word = match[0];
if (!added[word]) {
added[word] = true;
result.push(createNewProposal(CompletionItemKind.Variable, word, null));
}
}
}
var functionMatch = /function\s+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)\s*\(/g;
var match2: RegExpExecArray | null = null;
let functionMatch = /function\s+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)\s*\(/g;
let match2: RegExpExecArray | null = null;
while (match2 = functionMatch.exec(text)) {
var word2 = match2[1];
let word2 = match2[1];
if (!added[word2]) {
added[word2] = true;
result.push(createNewProposal(CompletionItemKind.Function, word2, null));

2
extensions/php-language-features/src/features/hoverProvider.ts
View File

@@ -23,7 +23,7 @@ export default class PHPHoverProvider implements HoverProvider {
let name = document.getText(wordRange);
var entry = phpGlobalFunctions.globalfunctions[name] || phpGlobals.compiletimeconstants[name] || phpGlobals.globalvariables[name] || phpGlobals.keywords[name];
let entry = phpGlobalFunctions.globalfunctions[name] || phpGlobals.compiletimeconstants[name] || phpGlobals.globalvariables[name] || phpGlobals.keywords[name];
if (entry && entry.description) {
let signature = name + (entry.signature || '');
let contents: MarkedString[] = [textToMarkedString(entry.description), { language: 'php', value: signature }];

2
extensions/php-language-features/src/features/phpGlobalFunctions.ts
View File

@@ -7,7 +7,7 @@
import { IEntries } from './phpGlobals';
export var globalfunctions: IEntries = {
export const globalfunctions: IEntries = {
debug_backtrace: {
description: 'Generates a backtrace',
signature: '([ int $options = DEBUG_BACKTRACE_PROVIDE_OBJECT [, int $limit = 0 ]]): array'

6
extensions/php-language-features/src/features/phpGlobals.ts
View File

@@ -8,7 +8,7 @@
export interface IEntry { description?: string; signature?: string; }
export interface IEntries { [name: string]: IEntry; }
export var globalvariables: IEntries = {
export const globalvariables: IEntries = {
$GLOBALS: {
description: 'An associative array containing references to all variables which are currently defined in the global scope of the script. The variable names are the keys of the array.',
},
@@ -55,7 +55,7 @@ export var globalvariables: IEntries = {
description: 'Refers to the current object',
},
};
export var compiletimeconstants: IEntries = {
export const compiletimeconstants: IEntries = {
__CLASS__: {
description: 'The class name. (Added in PHP 4.3.0) As of PHP 5 this constant returns the class name as it was declared (case-sensitive). In PHP 4 its value is always lowercased.',
},
@@ -159,7 +159,7 @@ export var compiletimeconstants: IEntries = {
description: 'The default algorithm to use for hashing if no algorithm is provided. This may change in newer PHP releases when newer, stronger hashing algorithms are supported.',
},
};
export var keywords: IEntries = {
export const keywords: IEntries = {
define: {
description: 'Defines a named constant at runtime.',
signature: '( string $name , mixed $value [, bool $case_insensitive = false ] ): bool'

72
extensions/php-language-features/src/features/signatureHelpProvider.ts
View File

@@ -7,27 +7,27 @@ import { SignatureHelpProvider, SignatureHelp, SignatureInformation, Cancellatio
import phpGlobals = require('./phpGlobals');
import phpGlobalFunctions = require('./phpGlobalFunctions');
var _NL = '\n'.charCodeAt(0);
var _TAB = '\t'.charCodeAt(0);
var _WSB = ' '.charCodeAt(0);
var _LBracket = '['.charCodeAt(0);
var _RBracket = ']'.charCodeAt(0);
var _LCurly = '{'.charCodeAt(0);
var _RCurly = '}'.charCodeAt(0);
var _LParent = '('.charCodeAt(0);
var _RParent = ')'.charCodeAt(0);
var _Comma = ','.charCodeAt(0);
var _Quote = '\''.charCodeAt(0);
var _DQuote = '"'.charCodeAt(0);
var _USC = '_'.charCodeAt(0);
var _a = 'a'.charCodeAt(0);
var _z = 'z'.charCodeAt(0);
var _A = 'A'.charCodeAt(0);
var _Z = 'Z'.charCodeAt(0);
var _0 = '0'.charCodeAt(0);
var _9 = '9'.charCodeAt(0);
const _NL = '\n'.charCodeAt(0);
const _TAB = '\t'.charCodeAt(0);
const _WSB = ' '.charCodeAt(0);
const _LBracket = '['.charCodeAt(0);
const _RBracket = ']'.charCodeAt(0);
const _LCurly = '{'.charCodeAt(0);
const _RCurly = '}'.charCodeAt(0);
const _LParent = '('.charCodeAt(0);
const _RParent = ')'.charCodeAt(0);
const _Comma = ','.charCodeAt(0);
const _Quote = '\''.charCodeAt(0);
const _DQuote = '"'.charCodeAt(0);
const _USC = '_'.charCodeAt(0);
const _a = 'a'.charCodeAt(0);
const _z = 'z'.charCodeAt(0);
const _A = 'A'.charCodeAt(0);
const _Z = 'Z'.charCodeAt(0);
const _0 = '0'.charCodeAt(0);
const _9 = '9'.charCodeAt(0);
var BOF = 0;
const BOF = 0;
class BackwardIterator {
@@ -58,7 +58,7 @@ class BackwardIterator {
this.lineNumber = -1;
return BOF;
}
var ch = this.line.charCodeAt(this.offset);
let ch = this.line.charCodeAt(this.offset);
this.offset--;
return ch;
}
@@ -74,27 +74,27 @@ export default class PHPSignatureHelpProvider implements SignatureHelpProvider {
return null;
}
var iterator = new BackwardIterator(document, position.character - 1, position.line);
let iterator = new BackwardIterator(document, position.character - 1, position.line);
var paramCount = this.readArguments(iterator);
let paramCount = this.readArguments(iterator);
if (paramCount < 0) {
return null;
}
var ident = this.readIdent(iterator);
let ident = this.readIdent(iterator);
if (!ident) {
return null;
}
var entry = phpGlobalFunctions.globalfunctions[ident] || phpGlobals.keywords[ident];
let entry = phpGlobalFunctions.globalfunctions[ident] || phpGlobals.keywords[ident];
if (!entry || !entry.signature) {
return null;
}
var paramsString = entry.signature.substring(0, entry.signature.lastIndexOf(')') + 1);
let paramsString = entry.signature.substring(0, entry.signature.lastIndexOf(')') + 1);
let signatureInfo = new SignatureInformation(ident + paramsString, entry.description);
var re = /\w*\s+\&?\$[\w_\.]+|void/g;
var match: RegExpExecArray | null = null;
let re = /\w*\s+\&?\$[\w_\.]+|void/g;
let match: RegExpExecArray | null = null;
while ((match = re.exec(paramsString)) !== null) {
signatureInfo.parameters.push({ label: match[0], documentation: '' });
}
@@ -106,12 +106,12 @@ export default class PHPSignatureHelpProvider implements SignatureHelpProvider {
}
private readArguments(iterator: BackwardIterator): number {
var parentNesting = 0;
var bracketNesting = 0;
var curlyNesting = 0;
var paramCount = 0;
let parentNesting = 0;
let bracketNesting = 0;
let curlyNesting = 0;
let paramCount = 0;
while (iterator.hasNext()) {
var ch = iterator.next();
let ch = iterator.next();
switch (ch) {
case _LParent:
parentNesting--;
@@ -153,10 +153,10 @@ export default class PHPSignatureHelpProvider implements SignatureHelpProvider {
}
private readIdent(iterator: BackwardIterator): string {
var identStarted = false;
var ident = '';
let identStarted = false;
let ident = '';
while (iterator.hasNext()) {
var ch = iterator.next();
let ch = iterator.next();
if (!identStarted && (ch === _WSB || ch === _TAB || ch === _NL)) {
continue;
}

6
extensions/php-language-features/src/features/utils/async.ts
View File

@@ -44,10 +44,10 @@ export class Throttler<T> {
this.queuedPromiseFactory = promiseFactory;
if (!this.queuedPromise) {
var onComplete = () => {
let onComplete = () => {
this.queuedPromise = null;
var result = this.queue(this.queuedPromiseFactory!);
let result = this.queue(this.queuedPromiseFactory!);
this.queuedPromiseFactory = null;
return result;
@@ -127,7 +127,7 @@ export class Delayer<T> {
this.completionPromise = null;
this.onResolve = null;
var result = this.task!();
let result = this.task!();
this.task = null;
return result;

10
extensions/php-language-features/src/features/validationProvider.ts
View File

@@ -23,20 +23,20 @@ export class LineDecoder {
}
public write(buffer: Buffer): string[] {
var result: string[] = [];
var value = this.remaining
let result: string[] = [];
let value = this.remaining
? this.remaining + this.stringDecoder.write(buffer)
: this.stringDecoder.write(buffer);
if (value.length < 1) {
return result;
}
var start = 0;
var ch: number;
let start = 0;
let ch: number;
while (start < value.length && ((ch = value.charCodeAt(start)) === 13 || ch === 10)) {
start++;
}
var idx = start;
let idx = start;
while (idx < value.length) {
ch = value.charCodeAt(idx);
if (ch === 13 || ch === 10) {