Skip to content

Remove cases from ResultsApp that seem to be impossible #3359

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
robertbrignull merged 2 commits into from
Feb 14, 2024
Merged

Remove cases from ResultsApp that seem to be impossible #3359

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9eb7f96
Remove impossible cases because resultsInfo cannot be null
robertbrignull Feb 14, 2024
51c81f9
Move setState call later
robertbrignull Feb 14, 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
68 changes: 21 additions & 47 deletions extensions/ql-vscode/src/view/results/ResultsApp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,55 +79,29 @@ export function ResultsApp() {

const updateStateWithNewResultsInfo = useCallback(
(resultsInfo: ResultsInfo): void => {
setState((prevState) => {
if (resultsInfo === null && prevState.isExpectingResultsUpdate) {
// Display loading message
return {
...prevState,
displayedResults: {
resultsInfo: null,
results: null,
errorMessage: "Loading results…",
},
nextResultsInfo: resultsInfo,
};
} else if (resultsInfo === null) {
// No results to display
return {
...prevState,
displayedResults: {
resultsInfo: null,
results: null,
errorMessage: "No results to display",
},
nextResultsInfo: resultsInfo,
};
}

let results: Results | null = null;
let statusText = "";
try {
const resultSets = getResultSets(resultsInfo);
results = {
resultSets,
database: resultsInfo.database,
sortStates: getSortStates(resultsInfo),
};
} catch (e) {
const errorMessage = getErrorMessage(e);
let results: Results | null = null;
let statusText = "";
try {
const resultSets = getResultSets(resultsInfo);
results = {
resultSets,
database: resultsInfo.database,
sortStates: getSortStates(resultsInfo),
};
} catch (e) {
const errorMessage = getErrorMessage(e);

statusText = `Error loading results: ${errorMessage}`;
}
statusText = `Error loading results: ${errorMessage}`;
}

return {
displayedResults: {
resultsInfo,
results,
errorMessage: statusText,
},
nextResultsInfo: null,
isExpectingResultsUpdate: false,
};
setState({
displayedResults: {
resultsInfo,
results,
errorMessage: statusText,
},
nextResultsInfo: null,
isExpectingResultsUpdate: false,
});
},
[],
Expand Down