Skip to content

Commit 1b54a38

Browse files
author
Andy
authored
Fix remaining lint errors (DefinitelyTyped#19219)
1 parent 3fcde35 commit 1b54a38

File tree

80 files changed

+256
-202
lines changed

Some content is hidden

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

80 files changed

+256
-202
lines changed

types/activex-adodb/activex-adodb-tests.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ let obj5 = new ActiveXObject('ADODB.Stream');
1414
let pathToExcelFile = 'C:\\path\\to\\excel\\file.xlsx';
1515
let conn = new ActiveXObject('ADODB.Connection');
1616
conn.Provider = 'Microsoft.ACE.OLEDB.12.0';
17-
conn.ConnectionString =
18-
'Data Source="' + pathToExcelFile + '";' +
19-
'Extended Properties="Excel 12.0;HDR=Yes"';
17+
conn.ConnectionString = `Data Source="${pathToExcelFile}";Extended Properties="Excel 12.0;HDR=Yes"`;
2018
conn.Open();
2119

2220
// create a Command to access the data

types/activex-scripting/activex-scripting-tests.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ function showFileAttributes(file: Scripting.File) {
4040
function showFreeSpace(drvPath: string) {
4141
const fso = new ActiveXObject('Scripting.FileSystemObject');
4242
const d = fso.GetDrive(fso.GetDriveName(drvPath));
43-
let s = 'Drive ' + drvPath + ' - ';
43+
let s = `Drive ${drvPath} - `;
4444
s += d.VolumeName + '<br>';
45-
s += 'Free Space: ' + d.FreeSpace / 1024 + ' Kbytes';
45+
s += `Free Space: ${d.FreeSpace / 1024} Kbytes`;
4646
return (s);
4747
}
4848

types/activex-wia/activex-wia-tests.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ let e = new Enumerator<WIA.Property>(dev.Properties); // no foreach over Active
3737
e.moveFirst();
3838
while (!e.atEnd()) {
3939
const p = e.item();
40-
let s = p.Name + ' (' + p.PropertyID + ') = ';
40+
let s = `${p.Name} (${p.PropertyID}) = `;
4141
if (p.IsVector) {
4242
s += '[vector of data]';
4343
} else {
4444
s += p.Value;
4545
if (p.SubType !== WIA.WiaSubType.UnspecifiedSubType) {
4646
if (p.Value !== p.SubTypeDefault) {
47-
s += ' (Default = ' + p.SubTypeDefault + ')';
47+
s += ` (Default = ${p.SubTypeDefault})`;
4848
}
4949
}
5050
}
@@ -70,7 +70,7 @@ while (!e.atEnd()) {
7070
s += ']';
7171
break;
7272
case WIA.WiaSubType.RangeSubType:
73-
s += ' [valid values in the range from ' + p.SubTypeMin + ' to ' + p.SubTypeMax + ' in increments of ' + p.SubTypeStep + ']';
73+
s += ` [valid values in the range from ${p.SubTypeMin} to ${p.SubTypeMax} in increments of ${p.SubTypeStep}]`;
7474
break;
7575
}
7676
}

types/algebra.js/algebra.js-tests.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import { Equation, Expression, Fraction, parse, toTex } from 'algebra.js';
3636
let expr1 = new Expression("a").add("b").add("c");
3737
let expr2 = new Expression("c").subtract("b");
3838
let expr3 = expr1.subtract(expr2);
39-
expr1.toString() + " - (" + expr2.toString() + ") = " + expr3.toString();
39+
`${expr1.toString()} - (${expr2.toString()}) = ${expr3.toString()}`;
4040

4141
expr1 = new Expression("x");
4242
expr1 = expr1.add(2);
@@ -46,7 +46,7 @@ import { Equation, Expression, Fraction, parse, toTex } from 'algebra.js';
4646
expr2 = expr2.multiply(new Fraction(1, 3));
4747
expr2 = expr2.add(4);
4848
expr3 = expr1.multiply(expr2);
49-
"(" + expr1.toString() + ")(" + expr2.toString() + ") = " + expr3.toString();
49+
`(${expr1.toString()})(${expr2.toString()}) = ${expr3.toString()}`;
5050

5151
x = new Expression("x").divide(2).divide(new Fraction(1, 5));
5252
x.toString();
@@ -58,7 +58,7 @@ import { Equation, Expression, Fraction, parse, toTex } from 'algebra.js';
5858
sum.toString();
5959
exp = new Expression("x").add(2);
6060
const exp3 = exp.pow(3);
61-
"(" + exp.toString() + ")^3 = " + exp3.toString();
61+
`(${exp.toString()})^3 = ${exp3.toString()}`;
6262

6363
let expr = new Expression("x");
6464
expr = expr.multiply(2);

types/angular/angular-tests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ function test_angular_forEach() {
620620
const log: string[] = [];
621621
angular.forEach(values, (value, key, obj) => {
622622
obj[key] = value;
623-
this.push(key + ': ' + value);
623+
this.push(`${key}: ${value}`);
624624
}, log);
625625
// expect(log).toEqual(['name: misko', 'gender: male']);
626626
}

types/awesomplete/awesomplete-tests.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ new Awesomplete('input[type="email"]', {
3535
"hotmail.co.uk", "mac.com", "me.com", "mail.com", "msn.com",
3636
"live.com", "sbcglobal.net", "verizon.net", "yahoo.com", "yahoo.co.uk"],
3737
data: (text: string, input: string) => {
38-
return input.slice(0, input.indexOf("@")) + "@" + text;
38+
return `${input.slice(0, input.indexOf("@"))}@${text}`;
3939
},
4040
filter: Awesomplete.FILTER_STARTSWITH
4141
});
@@ -47,7 +47,7 @@ new Awesomplete('input[data-multiple]', {
4747

4848
replace: (text: string) => {
4949
const before = this.input.value.match(/^.+,\s*|/)[0];
50-
this.input.value = before + text + ", ";
50+
this.input.value = `${before}${text}, `;
5151
}
5252
});
5353

types/bagpipes/tslint.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"extends": "dtslint/dt.json",
33
"rules": {
4-
"callable-types": false
4+
// TODOs
5+
"callable-types": false,
6+
"no-object-literal-type-assertion": false
57
}
68
}

types/better-sqlite3/better-sqlite3-tests.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as Database from 'better-sqlite3';
22

3-
let integer = Database.Integer(1);
4-
let err = new Database.SqliteError('ok', 'ok');
3+
const integer = Database.Integer(1);
4+
const err = new Database.SqliteError('ok', 'ok');
55

66
let db = Database('.');
77
db = new Database('.', {memory: true});
@@ -15,7 +15,7 @@ db.register({name: 'noop', deterministic: true, varargs: true}, () => {});
1515
db.defaultSafeIntegers();
1616
db.defaultSafeIntegers(true);
1717

18-
let stmt = db.prepare('SELECT * FROM test WHERE name == ?;');
18+
const stmt = db.prepare('SELECT * FROM test WHERE name == ?;');
1919
stmt.get(['name']);
2020
stmt.all({name: 'name'});
2121
stmt.each('name', (row: {name: string}) => {});
@@ -26,7 +26,7 @@ stmt.bind('name');
2626
stmt.safeIntegers();
2727
stmt.safeIntegers(true);
2828

29-
let trans = db.transaction(['INSERT INTO test(name) VALUES(?);']);
29+
const trans = db.transaction(['INSERT INTO test(name) VALUES(?);']);
3030
trans.run('name');
3131
trans.bind('name');
3232
trans.run();

types/better-sqlite3/index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Type definitions for better-sqlite3 3.1
22
// Project: http://github.com/JoshuaWise/better-sqlite3
3-
// Definitions by: Ben Davies <https://github.com/Morfent/>
3+
// Definitions by: Ben Davies <https://github.com/Morfent>
44
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
55

66
/// <reference types="node" />

types/bootstrap-slider/bootstrap-slider-tests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ $(() => {
1212
$('#ex2').slider({});
1313

1414
const RGBChange = () => {
15-
$('#RGB').css('background', 'rgb(' + r.getValue() + ',' + g.getValue() + ',' + b.getValue() + ')');
15+
$('#RGB').css('background', `rgb(${r.getValue()},${g.getValue()},${b.getValue()})`);
1616
};
1717

1818
const r = $('#R').slider()

0 commit comments

Comments
 (0)