Skip to content

session.ts: Revert some emptyArray back to undefined #17781

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
2 commits merged into from
Aug 14, 2017
Merged

session.ts: Revert some emptyArray back to undefined #17781

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cf4699
session.ts: Revert some `emptyArray` back to `undefined`
Aug 14, 2017
630d905
Fix
Aug 14, 2017
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/server/session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ namespace ts.server {

const definitions = project.getLanguageService().getDefinitionAtPosition(file, position);
if (!definitions) {
return emptyArray;
return undefined;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

undefined [](start = 23, length = 9)

This was probably fine as emptyArray, but I have no problem with reverting it.

}

if (simplifiedResult) {
Expand Down Expand Up @@ -669,7 +669,7 @@ namespace ts.server {
const occurrences = project.getLanguageService().getOccurrencesAtPosition(file, position);

if (!occurrences) {
return emptyArray;
return undefined;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

undefined [](start = 23, length = 9)

Was probably fine.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So -- leave it, or change it like this PR does?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In master, whichever is more consistent with the other requests. My impression is that it's undefined. In release-2.5, whichever it used to return (also undefined?).

}

return occurrences.map(occurrence => {
Expand Down Expand Up @@ -913,7 +913,7 @@ namespace ts.server {
if (simplifiedResult) {
const nameInfo = defaultProject.getLanguageService().getQuickInfoAtPosition(file, position);
if (!nameInfo) {
return emptyArray;
return undefined;
}

const displayString = displayPartsToString(nameInfo.displayParts);
Expand Down Expand Up @@ -1176,7 +1176,7 @@ namespace ts.server {

const completions = project.getLanguageService().getCompletionsAtPosition(file, position);
if (!completions) {
return emptyArray;
return undefined;
}
if (simplifiedResult) {
return mapDefined(completions.entries, entry => {
Expand Down