Skip to content

Commit 4186bd5

Browse files
author
Andy
authored
Merge pull request #14986 from Microsoft/typedef-whitespace
Fix options for typedef-whitespace lint rule
2 parents a62869c + 130a240 commit 4186bd5

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

src/harness/unittests/tsserverProjectSystem.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ namespace ts.projectSystem {
807807
path: "/c/app.ts",
808808
content: "let x = 1"
809809
};
810-
const makeProject = (f: FileOrFolder) => ({ projectFileName: f.path + ".csproj", rootFiles: [toExternalFile(f.path)], options: {} });
810+
const makeProject = (f: FileOrFolder) => ({ projectFileName: f.path + ".csproj", rootFiles: [toExternalFile(f.path)], options: {} });
811811
const p1 = makeProject(f1);
812812
const p2 = makeProject(f2);
813813
const p3 = makeProject(f3);

src/server/session.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ namespace ts.server {
219219
getCurrentRequestId(): number;
220220
sendRequestCompletedEvent(requestId: number): void;
221221
getServerHost(): ServerHost;
222-
isCancellationRequested(): boolean;
222+
isCancellationRequested(): boolean;
223223
executeWithRequestId(requestId: number, action: () => void): void;
224224
logError(error: Error, message: string): void;
225225
}

tslint.json

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,23 @@
2828
"check-separator",
2929
"check-type"
3030
],
31-
"typedef-whitespace": [true, {
32-
"call-signature": "nospace",
33-
"index-signature": "nospace",
34-
"parameter": "nospace",
35-
"property-declaration": "nospace",
36-
"variable-declaration": "nospace"
37-
}],
31+
"typedef-whitespace": [
32+
true,
33+
{
34+
"call-signature": "nospace",
35+
"index-signature": "nospace",
36+
"parameter": "nospace",
37+
"property-declaration": "nospace",
38+
"variable-declaration": "nospace"
39+
},
40+
{
41+
"call-signature": "onespace",
42+
"index-signature": "onespace",
43+
"parameter": "onespace",
44+
"property-declaration": "onespace",
45+
"variable-declaration": "onespace"
46+
}
47+
],
3848
"next-line": [true,
3949
"check-catch",
4050
"check-else"

0 commit comments

Comments
 (0)