Skip to content

Commit 511346a

Browse files
committed
Fixes to formatting
1 parent 641cca2 commit 511346a

8 files changed

Lines changed: 76 additions & 21 deletions

File tree

package.nls.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@
444444
"DataScience.startingJupyterNotebook": "Starting Jupyter Notebook",
445445
"DataScience.registeringKernel": "Registering Kernel",
446446
"DataScience.trimmedOutput": "Output was trimmed for performance reasons.\nTo see the full output set the setting \"python.dataScience.textOutputLimit\" to 0.",
447-
"DataScience.connectingToJupyterUri" : "Connecting to Jupyter server at {0}",
448-
"DataScience.createdNewNotebook" : "{0}: Creating new notebook ",
449-
"DataScience.createdNewKernel" : "{0}: Kernel started: {1}"
447+
"DataScience.connectingToJupyterUri": "Connecting to Jupyter server at {0}",
448+
"DataScience.createdNewNotebook": "{0}: Creating new notebook ",
449+
"DataScience.createdNewKernel": "{0}: Kernel started: {1}"
450450
}

src/test/format/extension.onTypeFormat.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@ suite('Try blocks with indentation of 4 spaces', () => {
331331
});
332332
});
333333

334-
// tslint:disable-next-line: max-func-body-length
335334
suite('Try blocks with indentation of Tab', () => {
336335
suiteSetup(async () => {
337336
await initialize();

src/test/refactor/rename.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ type RenameResponse = {
3131
results: [{ diff: string }];
3232
};
3333

34-
// tslint:disable-next-line: max-func-body-length
3534
suite('Refactor Rename', () => {
3635
const options: TextEditorOptions = {
3736
cursorStyle: TextEditorCursorStyle.Line,

src/test/testing/unittest/unittest.run.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ suite('Unit Tests - unittest - run with mocked process output', () => {
236236
assert.equal(results.summary.skipped, 1, 'skipped');
237237
});
238238

239-
// tslint:disable-next-line: max-func-body-length
240239
test(`Run Failed Tests [${cfg.startDirSwitch}, ${cfg.patternSwitch}]`, async () => {
241240
await updateSetting(
242241
'testing.unittestArgs',

tsconfig.datascience-ui.json

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,35 @@
66
"importHelpers": true,
77
"target": "es5",
88
"outDir": "out",
9-
"lib": ["es6", "dom"],
9+
"lib": [
10+
"es6",
11+
"dom"
12+
],
1013
"jsx": "react",
1114
"sourceMap": true,
12-
"rootDirs": ["node_modules/vsls", "src", "types"],
13-
"paths": { "*": ["types/*"] },
15+
"rootDirs": [
16+
"node_modules/vsls",
17+
"src",
18+
"types"
19+
],
20+
"paths": {
21+
"*": [
22+
"types/*"
23+
]
24+
},
1425
"experimentalDecorators": true,
1526
"allowSyntheticDefaultImports": true,
1627
"noImplicitThis": false,
1728
"noUnusedLocals": true,
1829
"noUnusedParameters": false,
1930
"strict": true
2031
},
21-
"exclude": [".vscode-test", ".vscode test", "src/test", "src/server", "src/client", "build"]
32+
"exclude": [
33+
".vscode-test",
34+
".vscode test",
35+
"src/test",
36+
"src/server",
37+
"src/client",
38+
"build"
39+
]
2240
}

tsconfig.extension.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,21 @@
44
"module": "commonjs",
55
"target": "es6",
66
"outDir": "out",
7-
"lib": ["es6"],
7+
"lib": [
8+
"es6"
9+
],
810
"jsx": "react",
911
"sourceMap": true,
1012
"rootDir": "src",
1113
"experimentalDecorators": true,
1214
"allowSyntheticDefaultImports": true,
1315
"noImplicitThis": false
1416
},
15-
"exclude": ["node_modules", ".vscode-test", ".vscode test", "src/datascience-ui", "build"]
17+
"exclude": [
18+
"node_modules",
19+
".vscode-test",
20+
".vscode test",
21+
"src/datascience-ui",
22+
"build"
23+
]
1624
}

tsconfig.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
{
22
"compilerOptions": {
33
"baseUrl": ".",
4-
"paths": { "*": ["types/*"] },
4+
"paths": {
5+
"*": [
6+
"types/*"
7+
]
8+
},
59
"module": "commonjs",
610
"target": "es2018",
711
"outDir": "out",
8-
"lib": ["es6", "es2018", "dom"],
12+
"lib": [
13+
"es6",
14+
"es2018",
15+
"dom"
16+
],
917
"jsx": "react",
1018
"sourceMap": true,
1119
"rootDir": "src",

tslint.json

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
{
2-
"rulesDirectory": ["./build/tslint-rules"],
2+
"rulesDirectory": [
3+
"./build/tslint-rules"
4+
],
35
"linterOptions": {
4-
"exclude": ["src/ipywidgets"]
6+
"exclude": [
7+
"src/ipywidgets"
8+
]
59
},
6-
"extends": ["tslint-eslint-rules", "tslint-microsoft-contrib", "tslint-plugin-prettier", "tslint-config-prettier"],
10+
"extends": [
11+
"tslint-eslint-rules",
12+
"tslint-microsoft-contrib",
13+
"tslint-plugin-prettier",
14+
"tslint-config-prettier"
15+
],
716
"rules": {
817
"prettier": true,
918
"messages-must-be-localized": true,
@@ -13,14 +22,23 @@
1322
"non-literal-fs-path": false,
1423
"newline-per-chained-call": false,
1524
"class-name": true,
16-
"semicolon": [true, "always", "strict-bound-class-methods"],
25+
"semicolon": [
26+
true,
27+
"always",
28+
"strict-bound-class-methods"
29+
],
1730
"triple-equals": true,
1831
"no-relative-imports": false,
1932
"max-line-length": false,
2033
"typedef": false,
2134
"no-string-throw": true,
2235
"missing-jsdoc": false,
23-
"one-line": [true, "check-catch", "check-finally", "check-else"],
36+
"one-line": [
37+
true,
38+
"check-catch",
39+
"check-finally",
40+
"check-else"
41+
],
2442
"no-parameter-properties": false,
2543
"no-parameter-reassignment": false,
2644
"no-reserved-keywords": false,
@@ -29,7 +47,11 @@
2947
"align": false,
3048
"linebreak-style": false,
3149
"strict-boolean-expressions": false,
32-
"await-promise": [true, "Thenable", "PromiseLike"],
50+
"await-promise": [
51+
true,
52+
"Thenable",
53+
"PromiseLike"
54+
],
3355
"completed-docs": false,
3456
"no-unsafe-any": false,
3557
"no-backbone-get-set-outside-model": false,
@@ -47,7 +69,9 @@
4769
"no-bitwise": false,
4870
"eofline": true,
4971
"switch-final-break": false,
50-
"no-implicit-dependencies": ["vscode"],
72+
"no-implicit-dependencies": [
73+
"vscode"
74+
],
5175
"no-unnecessary-type-assertion": false,
5276
"no-submodule-imports": false,
5377
"no-redundant-jsdoc": false,

0 commit comments

Comments
 (0)