Skip to content

Enable existing commit characters in certain locations where isNewIdentifier is true #59523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 19, 2024
Merged

Enable existing commit characters in certain locations where isNewIdentifier is true #59523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8e20fa9
Enable commit characters in more positions
gabritto Jul 31, 2024
bf2fb94
add comma to more places
gabritto Jul 31, 2024
719f824
set commit characters for dot completion case
gabritto Aug 1, 2024
22424c6
fixes and tests to global cases
gabritto Aug 2, 2024
d52d13c
add test for existing import and export cases
gabritto Aug 2, 2024
bfab059
refactor
gabritto Aug 2, 2024
9063257
Merge branch 'main' into gabritto/issue31244
gabritto Aug 2, 2024
73fed55
don't mutate commit characters
gabritto Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/harness/fourslashImpl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,8 +1037,8 @@ export class TestState {

if (ts.hasProperty(options, "defaultCommitCharacters")) {
assert.deepEqual(
actualCompletions.defaultCommitCharacters?.sort(),
options.defaultCommitCharacters?.sort(),
actualCompletions.defaultCommitCharacters?.slice().sort(),
options.defaultCommitCharacters?.slice().sort(),
"Expected 'defaultCommitCharacters' properties to match",
);
}
Expand Down Expand Up @@ -1191,8 +1191,8 @@ export class TestState {
assert.equal(actual.sortText, expected.sortText || ts.Completions.SortText.LocationPriority, `At entry ${actual.name}: Expected 'sortText' properties to match`);
if (ts.hasProperty(expected, "commitCharacters")) {
assert.deepEqual(
actual.commitCharacters?.sort(),
expected.commitCharacters?.sort(),
actual.commitCharacters?.slice().sort(),
expected.commitCharacters?.slice().sort(),
`At entry ${actual.name}: Expected 'commitCharacters' values to match`,
);
}
Expand Down
155 changes: 115 additions & 40 deletions src/services/completions.ts
View file
Open in desktop

Large diffs are not rendered by default.

60 changes: 50 additions & 10 deletions tests/baselines/reference/completionsCommentsClassMembers.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15330,7 +15330,11 @@
]
}
],
"defaultCommitCharacters": []
"defaultCommitCharacters": [
".",
",",
";"
]
}
},
{
Expand Down Expand Up @@ -27308,7 +27312,11 @@
]
}
],
"defaultCommitCharacters": []
"defaultCommitCharacters": [
".",
",",
";"
]
}
},
{
Expand Down Expand Up @@ -45958,7 +45966,11 @@
]
}
],
"defaultCommitCharacters": []
"defaultCommitCharacters": [
".",
",",
";"
]
}
},
{
Expand Down Expand Up @@ -56488,7 +56500,11 @@
]
}
],
"defaultCommitCharacters": []
"defaultCommitCharacters": [
".",
",",
";"
]
}
},
{
Expand Down Expand Up @@ -61751,7 +61767,11 @@
]
}
],
"defaultCommitCharacters": []
"defaultCommitCharacters": [
".",
",",
";"
]
}
},
{
Expand Down Expand Up @@ -69949,7 +69969,11 @@
]
}
],
"defaultCommitCharacters": []
"defaultCommitCharacters": [
".",
",",
";"
]
}
},
{
Expand Down Expand Up @@ -78147,7 +78171,11 @@
]
}
],
"defaultCommitCharacters": []
"defaultCommitCharacters": [
".",
",",
";"
]
}
},
{
Expand Down Expand Up @@ -86345,7 +86373,11 @@
]
}
],
"defaultCommitCharacters": []
"defaultCommitCharacters": [
".",
",",
";"
]
}
},
{
Expand Down Expand Up @@ -90932,7 +90964,11 @@
]
}
],
"defaultCommitCharacters": []
"defaultCommitCharacters": [
".",
",",
";"
]
}
},
{
Expand Down Expand Up @@ -100829,7 +100865,11 @@
]
}
],
"defaultCommitCharacters": []
"defaultCommitCharacters": [
".",
",",
";"
]
}
}
]
6 changes: 5 additions & 1 deletion tests/baselines/reference/completionsCommentsFunctionDeclaration.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8290,7 +8290,11 @@
]
}
],
"defaultCommitCharacters": []
"defaultCommitCharacters": [
".",
",",
";"
]
}
},
{
Expand Down
Loading