Skip to content

Commit 19ed5bf

Browse files
author
Benjamin Pasero
committed
some tslinting in base
1 parent 6485896 commit 19ed5bf

28 files changed

Lines changed: 250 additions & 264 deletions

‎src/vs/base/browser/ui/countBadge/countBadge.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ import 'vs/css!./countBadge';
99
import Builder = require('vs/base/browser/builder');
1010
import Strings = require('vs/base/common/strings');
1111

12-
var $ = Builder.$;
12+
const $ = Builder.$;
1313

1414
export class CountBadge {
1515

1616
private $el: Builder.Builder;
1717
private count: number;
1818
private titleFormat: string;
1919

20-
constructor (container:Builder.Builder, count?:number, titleFormat?:string);
21-
constructor (container:HTMLElement, count?:number, titleFormat?:string);
22-
constructor (container:any, count?:number, titleFormat?:string) {
20+
constructor(container: Builder.Builder, count?: number, titleFormat?: string);
21+
constructor(container: HTMLElement, count?: number, titleFormat?: string);
22+
constructor(container: any, count?: number, titleFormat?: string) {
2323
this.$el = $('.monaco-count-badge').appendTo(container);
2424
this.titleFormat = titleFormat || '';
2525
this.setCount(count || 0);

‎src/vs/base/browser/ui/filelabel/fileLabel.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export class FileLabel {
3737
}
3838

3939
public setValue(arg1: uri | string): void {
40-
var newPath = getPath(arg1);
40+
let newPath = getPath(arg1);
4141

4242
if (this.renderedOnce && this.path === newPath) {
4343
// don't render again if nothing has changed
@@ -52,15 +52,15 @@ export class FileLabel {
5252
private render(): void {
5353
dom.clearNode(this.domNode);
5454

55-
var htmlContent: string[] = [];
55+
let htmlContent: string[] = [];
5656

5757
htmlContent.push('<span class="file-name">');
5858
htmlContent.push(paths.basename(this.path));
5959
htmlContent.push('</span>');
6060

61-
var parent = paths.dirname(this.path);
61+
let parent = paths.dirname(this.path);
6262
if (parent && parent !== '.') {
63-
var pathLabel = getPathLabel(parent, this.basepath);
63+
let pathLabel = getPathLabel(parent, this.basepath);
6464
htmlContent.push('<span class="file-path" title="' + pathLabel + '">');
6565
htmlContent.push(pathLabel);
6666
htmlContent.push('</span>');
@@ -80,7 +80,7 @@ function getPath(arg1: uri | string | IWorkspaceProvider): string {
8080
}
8181

8282
if (types.isFunction((<IWorkspaceProvider>arg1).getWorkspace)) {
83-
var ws = (<IWorkspaceProvider>arg1).getWorkspace();
83+
let ws = (<IWorkspaceProvider>arg1).getWorkspace();
8484
return ws ? ws.resource.fsPath : void 0;
8585
}
8686

‎src/vs/base/browser/ui/progressbar/progressbar.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ import Builder = require('vs/base/browser/builder');
1313
import DOM = require('vs/base/browser/dom');
1414
import Uuid = require('vs/base/common/uuid');
1515

16-
var css_done = 'done';
17-
var css_active = 'active';
18-
var css_infinite = 'infinite';
19-
var css_discrete = 'discrete';
20-
var css_progress_container = 'progress-container';
21-
var css_progress_bit = 'progress-bit';
16+
const css_done = 'done';
17+
const css_active = 'active';
18+
const css_infinite = 'infinite';
19+
const css_discrete = 'discrete';
20+
const css_progress_container = 'progress-container';
21+
const css_progress_bit = 'progress-bit';
2222

23-
var $ = Builder.$;
23+
const $ = Builder.$;
2424

2525
/**
2626
* A progress bar with support for infinite or discrete progress.
@@ -43,8 +43,8 @@ export class ProgressBar {
4343
this.create(builder);
4444
}
4545

46-
private create(builder: Builder.Builder): void {
47-
builder.div({ 'class': css_progress_container }, (builder) => {
46+
private create(parent: Builder.Builder): void {
47+
parent.div({ 'class': css_progress_container }, (builder) => {
4848
this.element = builder.clone();
4949

5050
builder.div({ 'class': css_progress_bit }).on([DOM.EventType.ANIMATION_START, DOM.EventType.ANIMATION_END, DOM.EventType.ANIMATION_ITERATION], (e: Event) => {
@@ -134,7 +134,7 @@ export class ProgressBar {
134134
if (!Browser.hasCSSAnimationSupport()) {
135135

136136
// Use a generated token to avoid race conditions from reentrant calls to this function
137-
var currentProgressToken = Uuid.v4().asHex();
137+
let currentProgressToken = Uuid.v4().asHex();
138138
this.currentProgressToken = currentProgressToken;
139139

140140
this.manualInfinite(currentProgressToken);
@@ -148,8 +148,8 @@ export class ProgressBar {
148148
this.bit.style.width = '5%';
149149
this.bit.style.display = 'inherit';
150150

151-
var counter = 0;
152-
var animationFn: () => void = () => {
151+
let counter = 0;
152+
let animationFn: () => void = () => {
153153
WinJS.Promise.timeout(50).then(() => {
154154

155155
// Return if another manualInfinite() call was made

‎src/vs/base/browser/ui/resourceviewer/resourceViewer.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import 'vs/css!./resourceviewer';
99
import nls = require('vs/nls');
10-
import strings = require('vs/base/common/strings');
1110
import mimes = require('vs/base/common/mime');
1211
import URI from 'vs/base/common/uri';
1312
import paths = require('vs/base/common/paths');
@@ -62,7 +61,7 @@ const mapExtToMediaMimes = {
6261
'.flv': 'video/x-flv',
6362
'.avi': 'video/x-msvideo',
6463
'.movie': 'video/x-sgi-movie'
65-
}
64+
};
6665

6766
/**
6867
* Helper to actually render the given resource into the provided container. Will adjust scrollbar (if provided) automatically based on loading
@@ -102,7 +101,7 @@ export class ResourceViewer {
102101

103102
// Embed Object (only PDF for now)
104103
else if (false /* PDF is currently not supported in Electron it seems */ && mime.indexOf('pdf') >= 0) {
105-
var object = $(container)
104+
$(container)
106105
.empty()
107106
.style({ padding: 0, margin: 0 }) // We really do not want any paddings or margins when displaying PDFs
108107
.element('object')
@@ -133,7 +132,7 @@ export class ResourceViewer {
133132

134133
// Embed Video (if supported in browser)
135134
else if (mime.indexOf('video/') >= 0) {
136-
var video = $(container)
135+
$(container)
137136
.empty()
138137
.style({ paddingLeft: '20px' }) // restore CSS value in case the user saw a PDF before where we remove padding
139138
.element('video')

‎src/vs/base/common/comparers.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66

77
import strings = require('vs/base/common/strings');
88

9-
var FileNameMatch = /^(.*)\.([^.]*)|([^.]+)$/;
9+
const FileNameMatch = /^(.*)\.([^.]*)|([^.]+)$/;
1010

1111
export function compareFileNames(one: string, other: string): number {
12-
var oneMatch = FileNameMatch.exec(one.toLowerCase());
13-
var otherMatch = FileNameMatch.exec(other.toLowerCase());
12+
let oneMatch = FileNameMatch.exec(one.toLowerCase());
13+
let otherMatch = FileNameMatch.exec(other.toLowerCase());
1414

15-
var oneName = oneMatch[1] || oneMatch[3] || '';
16-
var oneExtension = oneMatch[2] || '';
15+
let oneName = oneMatch[1] || oneMatch[3] || '';
16+
let oneExtension = oneMatch[2] || '';
1717

18-
var otherName = otherMatch[1] || otherMatch[3] || '';
19-
var otherExtension = otherMatch[2] || '';
18+
let otherName = otherMatch[1] || otherMatch[3] || '';
19+
let otherExtension = otherMatch[2] || '';
2020

2121
if (oneName !== otherName) {
2222
return oneName < otherName ? -1 : 1;
@@ -26,8 +26,8 @@ export function compareFileNames(one: string, other: string): number {
2626
}
2727

2828
export function compareAnything(one: string, other: string, lookFor: string): number {
29-
var elementAName = one.toLowerCase();
30-
var elementBName = other.toLowerCase();
29+
let elementAName = one.toLowerCase();
30+
let elementBName = other.toLowerCase();
3131

3232
// Sort prefix matches over non prefix matches
3333
const prefixCompare = compareByPrefix(one, other, lookFor);
@@ -36,14 +36,14 @@ export function compareAnything(one: string, other: string, lookFor: string): nu
3636
}
3737

3838
// Sort suffix matches over non suffix matches
39-
var elementASuffixMatch = strings.endsWith(elementAName, lookFor);
40-
var elementBSuffixMatch = strings.endsWith(elementBName, lookFor);
39+
let elementASuffixMatch = strings.endsWith(elementAName, lookFor);
40+
let elementBSuffixMatch = strings.endsWith(elementBName, lookFor);
4141
if (elementASuffixMatch !== elementBSuffixMatch) {
4242
return elementASuffixMatch ? -1 : 1;
4343
}
4444

4545
// Understand file names
46-
var r = compareFileNames(elementAName, elementBName);
46+
let r = compareFileNames(elementAName, elementBName);
4747
if (r !== 0) {
4848
return r;
4949
}
@@ -53,12 +53,12 @@ export function compareAnything(one: string, other: string, lookFor: string): nu
5353
}
5454

5555
export function compareByPrefix(one: string, other: string, lookFor: string): number {
56-
var elementAName = one.toLowerCase();
57-
var elementBName = other.toLowerCase();
56+
let elementAName = one.toLowerCase();
57+
let elementBName = other.toLowerCase();
5858

5959
// Sort prefix matches over non prefix matches
60-
var elementAPrefixMatch = elementAName.indexOf(lookFor) === 0;
61-
var elementBPrefixMatch = elementBName.indexOf(lookFor) === 0;
60+
let elementAPrefixMatch = elementAName.indexOf(lookFor) === 0;
61+
let elementBPrefixMatch = elementBName.indexOf(lookFor) === 0;
6262
if (elementAPrefixMatch !== elementBPrefixMatch) {
6363
return elementAPrefixMatch ? -1 : 1;
6464
}

‎src/vs/base/common/errors.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export class ErrorHandler {
7474
}
7575
}
7676

77-
export var errorHandler = new ErrorHandler();
77+
export let errorHandler = new ErrorHandler();
7878

7979
export function setUnexpectedErrorHandler(newUnexpectedErrorHandler: (e: any) => void): void {
8080
errorHandler.setUnexpectedErrorHandler(newUnexpectedErrorHandler);
@@ -98,7 +98,7 @@ export function transformErrorForSerialization(error: any): any {
9898
if (!(error instanceof Error)) {
9999
return error;
100100
}
101-
var data: any = {};
101+
let data: any = {};
102102
if (error.stacktrace) {
103103
data.stack = error.stacktrace;
104104
} else if (error.stack) {
@@ -139,7 +139,7 @@ export class ConnectionError implements Error {
139139

140140
if (this.responseText) {
141141
try {
142-
var errorObj = JSON.parse(this.responseText);
142+
let errorObj = JSON.parse(this.responseText);
143143
this.errorMessage = errorObj.message;
144144
this.errorCode = errorObj.code;
145145
this.errorObject = errorObj;
@@ -158,8 +158,8 @@ export class ConnectionError implements Error {
158158
}
159159

160160
private connectionErrorDetailsToMessage(error: ConnectionError, verbose: boolean): string {
161-
var errorCode = error.errorCode;
162-
var errorMessage = error.errorMessage;
161+
let errorCode = error.errorCode;
162+
let errorMessage = error.errorMessage;
163163

164164
if (errorCode !== null && errorMessage !== null) {
165165
return nls.localize(
@@ -186,7 +186,7 @@ export class ConnectionError implements Error {
186186
}
187187

188188
private connectionErrorToMessage(error: ConnectionError, verbose: boolean): string {
189-
var details = this.connectionErrorDetailsToMessage(error, verbose);
189+
let details = this.connectionErrorDetailsToMessage(error, verbose);
190190

191191
// Status Code based Error
192192
if (error.status === 401) {
@@ -232,7 +232,7 @@ export class ConnectionError implements Error {
232232
objects.derive(Error, ConnectionError);
233233

234234
function _xhrToErrorMessage(xhr: IConnectionErrorData, verbose: boolean): string {
235-
var ce = new ConnectionError(xhr);
235+
let ce = new ConnectionError(xhr);
236236
if (verbose) {
237237
return ce.verboseMessage;
238238
} else {
@@ -263,8 +263,8 @@ export function toErrorMessage(error: any = null, verbose: boolean = false): str
263263
}
264264

265265
if (Array.isArray(error)) {
266-
var errors: any[] = arrays.coalesce(error);
267-
var msg = toErrorMessage(errors[0], verbose);
266+
let errors: any[] = arrays.coalesce(error);
267+
let msg = toErrorMessage(errors[0], verbose);
268268

269269
if (errors.length > 1) {
270270
return nls.localize('error.moreErrors', "{0} ({1} errors in total)", msg, errors.length);
@@ -282,15 +282,15 @@ export function toErrorMessage(error: any = null, verbose: boolean = false): str
282282
}
283283

284284
if (error.detail) {
285-
var detail = error.detail;
285+
let detail = error.detail;
286286

287287
if (detail.error) {
288288
if (detail.error && !types.isUndefinedOrNull(detail.error.status)) {
289289
return _xhrToErrorMessage(detail.error, verbose);
290290
}
291291

292292
if (types.isArray(detail.error)) {
293-
for (var i = 0; i < detail.error.length; i++) {
293+
for (let i = 0; i < detail.error.length; i++) {
294294
if (detail.error[i] && !types.isUndefinedOrNull(detail.error[i].status)) {
295295
return _xhrToErrorMessage(detail.error[i], verbose);
296296
}
@@ -328,7 +328,7 @@ export function toErrorMessage(error: any = null, verbose: boolean = false): str
328328
export function getHttpStatus(error: any): number {
329329
if (error) {
330330
if (types.isArray(error)) {
331-
for (var i = 0; i < error.length; i++) {
331+
for (let i = 0; i < error.length; i++) {
332332
if (error[i] && error[i].status) {
333333
return error[i].status;
334334
}
@@ -341,7 +341,7 @@ export function getHttpStatus(error: any): number {
341341
return -1;
342342
}
343343

344-
var canceledName = 'Canceled';
344+
let canceledName = 'Canceled';
345345

346346
/**
347347
* Checks if the given error is a promise in canceled state
@@ -354,7 +354,7 @@ export function isPromiseCanceledError(error: any): boolean {
354354
* Returns an error that signals cancellation.
355355
*/
356356
export function canceled(): Error {
357-
var error = new Error(canceledName);
357+
let error = new Error(canceledName);
358358
error.name = error.message;
359359
return error;
360360
}
@@ -400,7 +400,7 @@ export interface IErrorOptions {
400400
}
401401

402402
export function create(message: string, options: IErrorOptions = {}): Error {
403-
var result = new Error(message);
403+
let result = new Error(message);
404404

405405
if (types.isNumber(options.severity)) {
406406
(<any>result).severity = options.severity;

0 commit comments

Comments
 (0)