Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix extra newline

Browse Source
This commit is contained in:
Gabriela Araujo Britto
2021-11-05 07:08:51 -07:00
parent 831b770b95
commit 74cd7a5c6c
12 changed files with 101 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/completions.ts
+5 -2
View File
@@ -851,7 +851,7 @@ namespace ts.Completions {
removeComments: true,
module: options.module,
target: options.target,
omitTrailingSemicolon: true,
omitTrailingSemicolon: false,
newLine: getNewLineKind(getNewLineCharacter(options, maybeBind(host, host.getNewLine))),
});
const importAdder = codefix.createImportAdder(sourceFile, program, preferences, host);
@@ -922,7 +922,10 @@ namespace ts.Completions {
isAbstract);
if (completionNodes.length) {
insertText = printer.printSnippetList(ListFormat.MultiLine, factory.createNodeArray(completionNodes), sourceFile);
insertText = printer.printSnippetList(
ListFormat.MultiLine | ListFormat.NoTrailingNewLine,
factory.createNodeArray(completionNodes),
sourceFile);
}
return { insertText, isSnippet, importAdder };
tests/cases/fourslash/completionsOverridingMethod.ts
+13 -21
View File
@@ -129,8 +129,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText:
"foo(param1: string, param2: boolean): Promise<void> {\n}\n",
insertText: "foo(param1: string, param2: boolean): Promise<void> {\n}",
}
],
});
@@ -152,8 +151,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText:
"foo(a: string, b: string): string {\n}\n",
insertText: "foo(a: string, b: string): string {\n}",
}
],
});
@@ -175,8 +173,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText:
"foo(a: string): string {\n}\n",
insertText: "foo(a: string): string {\n}",
}
],
});
@@ -198,8 +195,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText:
"foo(a: string): string {\n}\n",
insertText: "foo(a: string): string {\n}",
}
],
});
@@ -221,8 +217,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText:
"foo(a: string): string {\n}\n",
insertText: "foo(a: string): string {\n}",
}
],
});
@@ -244,8 +239,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText:
"foo(a: string): string {\n}\n",
insertText: "foo(a: string): string {\n}",
}
],
});
@@ -268,9 +262,10 @@ verify.completions({
end: 0,
},
insertText:
"foo(a: string): string;\n\
foo(a: undefined, b: number): string;\n\
foo(a: any, b?: any): string {\n}\n",
`foo(a: string): string;
foo(a: undefined, b: number): string;
foo(a: any, b?: any): string {
}`,
}
],
});
@@ -302,8 +297,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText:
"met(n: number): number {\n}\n",
insertText: "met(n: number): number {\n}",
}
],
});
@@ -325,8 +319,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText:
"met<T>(t: T): T {\n}\n",
insertText: "met<T>(t: T): T {\n}",
},
{
name: "metcons",
@@ -336,8 +329,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText:
"metcons<T extends string | number>(t: T): T {\n}\n",
insertText: "metcons<T extends string | number>(t: T): T {\n}",
}
],
});
tests/cases/fourslash/completionsOverridingMethod1.ts
+1 -2
View File
@@ -30,8 +30,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText:
"override foo(a: string): void {\n}\n",
insertText: "override foo(a: string): void {\n}",
}
],
});
tests/cases/fourslash/completionsOverridingMethod10.ts
+63
View File
@@ -0,0 +1,63 @@
/// <reference path="fourslash.ts" />
// @Filename: a.ts
// @newline: LF
// Case: formatting: semicolons
////interface Base {
//// a: string;
//// b(a: string): void;
//// c(a: string): string;
//// c(a: number): number;
////}
////class Sub implements Base {
//// /*a*/
////}
verify.completions({
marker: "a",
isNewIdentifierLocation: true,
preferences: {
includeCompletionsWithInsertText: true,
includeCompletionsWithSnippetText: false,
includeCompletionsWithClassMemberSnippets: true,
},
includes: [
{
name: "a",
sortText: completion.SortText.LocationPriority,
replacementSpan: {
fileName: "",
pos: 0,
end: 0,
},
insertText: "a: string;",
},
{
name: "b",
sortText: completion.SortText.LocationPriority,
replacementSpan: {
fileName: "",
pos: 0,
end: 0,
},
insertText:
`b(a: string): void {
}`,
},
{
name: "c",
sortText: completion.SortText.LocationPriority,
replacementSpan: {
fileName: "",
pos: 0,
end: 0,
},
insertText:
`c(a: string): string;
c(a: number): number;
c(a: any): string | number {
}`,
},
],
});
tests/cases/fourslash/completionsOverridingMethod2.ts
+1 -2
View File
@@ -29,8 +29,7 @@ verify.completions({
end: 0,
},
isSnippet: true,
insertText:
"\"\\$usd\"(a: number): number {\n $0\n}\n",
insertText: "\"\\$usd\"(a: number): number {\n $0\n}",
}
],
});
tests/cases/fourslash/completionsOverridingMethod3.ts
+1 -2
View File
@@ -29,8 +29,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText:
"boo(): string;\n",
insertText: "boo(): string;",
}
],
});
tests/cases/fourslash/completionsOverridingMethod4.ts
+2 -2
View File
@@ -48,7 +48,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText: "protected hint(): string {\n}\n",
insertText: "protected hint(): string {\n}",
},
{
name: "refuse",
@@ -58,7 +58,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText: "public refuse(): string {\n}\n",
insertText: "public refuse(): string {\n}",
}
],
});
tests/cases/fourslash/completionsOverridingMethod5.ts
+6 -6
View File
@@ -34,7 +34,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText: "met(n: string): void {\n}\n",
insertText: "met(n: string): void {\n}",
},
{
name: "met2",
@@ -44,7 +44,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText: "met2(n: number): void {\n}\n",
insertText: "met2(n: number): void {\n}",
}
],
});
@@ -66,7 +66,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText: "met(n: string): void;\n",
insertText: "met(n: string): void;",
},
{
name: "met2",
@@ -76,7 +76,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText: "met2(n: number): void;\n",
insertText: "met2(n: number): void;",
}
],
});
@@ -98,7 +98,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText: "met(n: string): void;\n",
insertText: "met(n: string): void;",
},
{
name: "met2",
@@ -108,7 +108,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText: "met2(n: number): void;\n",
insertText: "met2(n: number): void;",
}
],
});
tests/cases/fourslash/completionsOverridingMethod6.ts
+6 -5
View File
@@ -43,7 +43,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText: "method(): number {\n}\n",
insertText: "method(): number {\n}",
},
],
});
@@ -65,7 +65,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText: "method(): number;\n",
insertText: "method(): number;",
},
],
});
@@ -88,9 +88,10 @@ verify.completions({
end: 0,
},
insertText:
"fun(a: number): number;\n\
public fun(a: undefined, b: string): number;\n\
public fun(a: any, b?: any): number {\n}\n",
`fun(a: number): number;
public fun(a: undefined, b: string): number;
public fun(a: any, b?: any): number {
}`,
},
],
});
tests/cases/fourslash/completionsOverridingMethod7.ts
+1 -2
View File
@@ -31,8 +31,7 @@ verify.completions({
},
insertText:
`M<T>(t: T): void;
abstract M<T>(t: T, x: number): void;
`,
abstract M<T>(t: T, x: number): void;`,
},
],
});
tests/cases/fourslash/completionsOverridingMethod8.ts
+1 -1
View File
@@ -32,7 +32,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText: "method(p: I): void {\n}\n",
insertText: "method(p: I): void {\n}",
hasAction: true,
source: completion.CompletionSource.ClassMemberSnippet,
}],
tests/cases/fourslash/completionsOverridingProperties.ts
+1 -3
View File
@@ -5,7 +5,6 @@
// Case: Properties
////class Base {
//// protected foo: string = "bar";
////
////}
////
////class Sub extends Base {
@@ -32,8 +31,7 @@ verify.completions({
pos: 0,
end: 0,
},
insertText:
"protected foo: string;\n",
insertText: "protected foo: string;",
}
],
});