Skip to content

Commit 5cc0086

Browse files
committed
Enable no-var-keyword tslint rule
1 parent 3f8579f commit 5cc0086

42 files changed

Lines changed: 558 additions & 562 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

extensions/emmet/src/abbreviationActions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ export function expandEmmetAbbreviation(args: any): Thenable<boolean | undefined
295295

296296
let selectionsInReverseOrder = editor.selections.slice(0);
297297
selectionsInReverseOrder.sort((a, b) => {
298-
var posA = a.isReversed ? a.anchor : a.active;
299-
var posB = b.isReversed ? b.anchor : b.active;
298+
const posA = a.isReversed ? a.anchor : a.active;
299+
const posB = b.isReversed ? b.anchor : b.active;
300300
return posA.compareTo(posB) * -1;
301301
});
302302

extensions/html-language-features/server/src/modes/embeddedSupport.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export interface HTMLDocumentRegions {
1818
getImportedScripts(): string[];
1919
}
2020

21-
export var CSS_STYLE_RULE = '__';
21+
export const CSS_STYLE_RULE = '__';
2222

2323
interface EmbeddedRegion { languageId: string | undefined; start: number; end: number; attributeValue?: boolean; }
2424

extensions/html-language-features/server/src/modes/htmlMode.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export function getHTMLMode(htmlLanguageService: HTMLLanguageService, workspace:
7878
}
7979

8080
function merge(src: any, dst: any): any {
81-
for (var key in src) {
81+
for (const key in src) {
8282
if (src.hasOwnProperty(key)) {
8383
dst[key] = src[key];
8484
}

extensions/html-language-features/server/src/modes/languageModes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export interface LanguageModeRange extends Range {
6767

6868
export function getLanguageModes(supportedLanguages: { [languageId: string]: boolean; }, workspace: Workspace, customTags?: ITagSet, customAttributes?: IAttributeSet): LanguageModes {
6969

70-
var htmlLanguageService = getHTMLLanguageService({
70+
const htmlLanguageService = getHTMLLanguageService({
7171
customTags,
7272
customAttributes
7373
});

extensions/html-language-features/server/src/utils/arrays.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
export function pushAll<T>(to: T[], from: T[]) {
77
if (from) {
8-
for (var i = 0; i < from.length; i++) {
8+
for (let i = 0; i < from.length; i++) {
99
to.push(from[i]);
1010
}
1111
}

extensions/html-language-features/server/src/utils/strings.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export function endsWith(haystack: string, needle: string): boolean {
5252
}
5353

5454
export function repeat(value: string, count: number) {
55-
var s = '';
55+
let s = '';
5656
while (count > 0) {
5757
if ((count & 1) === 1) {
5858
s += value;

extensions/json-language-features/server/src/jsonServerMain.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ let formatterRegistration: Thenable<Disposable> | null = null;
180180

181181
// The settings have changed. Is send on server activation as well.
182182
connection.onDidChangeConfiguration((change) => {
183-
var settings = <Settings>change.settings;
183+
let settings = <Settings>change.settings;
184184
configureHttpRequests(settings.http && settings.http.proxy, settings.http && settings.http.proxyStrictSSL);
185185

186186
jsonConfigurationSettings = settings.json && settings.json.schemas;
@@ -233,7 +233,7 @@ function updateConfiguration() {
233233
schemas: new Array<SchemaConfiguration>()
234234
};
235235
if (schemaAssociations) {
236-
for (var pattern in schemaAssociations) {
236+
for (const pattern in schemaAssociations) {
237237
const association = schemaAssociations[pattern];
238238
if (Array.isArray(association)) {
239239
association.forEach(uri => {

extensions/markdown-language-features/preview-src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import throttle = require('lodash.throttle');
1212

1313
declare var acquireVsCodeApi: any;
1414

15-
var scrollDisabled = true;
15+
let scrollDisabled = true;
1616
const marker = new ActiveLineMarker();
1717
const settings = getSettings();
1818

extensions/merge-conflict/src/delayer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export class Delayer<T> {
3535
}).then(() => {
3636
this.completionPromise = null;
3737
this.onSuccess = null;
38-
var result = this.task!();
38+
let result = this.task!();
3939
this.task = null;
4040
return result;
4141
});

extensions/merge-conflict/src/documentTracker.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
9191
return false;
9292
}
9393

94-
var task = this.cache.get(key);
95-
94+
const task = this.cache.get(key);
9695
if (!task) {
9796
return false;
9897
}

0 commit comments

Comments
 (0)