mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Move getNewSelection to before it is used

Browse Source
This commit is contained in:
Robert
2023-08-21 15:05:26 +01:00
parent 5fc34248b3
commit 4e376063ee
1 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
extensions/ql-vscode/src/view/results/AlertTable.tsx
View File

@@ -114,6 +114,49 @@ export class AlertTable extends React.Component<
);
}
private getNewSelection(
key: Keys.ResultKey | undefined,
direction: NavigationDirection,
): Keys.ResultKey {
if (key === undefined) {
return { resultIndex: 0 };
}
const { resultIndex, pathIndex, pathNodeIndex } = key;
switch (direction) {
case NavigationDirection.up:
case NavigationDirection.down: {
const delta = direction === NavigationDirection.up ? -1 : 1;
if (key.pathNodeIndex !== undefined) {
return {
resultIndex,
pathIndex: key.pathIndex,
pathNodeIndex: key.pathNodeIndex + delta,
};
} else if (pathIndex !== undefined) {
return { resultIndex, pathIndex: pathIndex + delta };
} else {
return { resultIndex: resultIndex + delta };
}
}
case NavigationDirection.left:
if (key.pathNodeIndex !== undefined) {
return { resultIndex, pathIndex: key.pathIndex };
} else if (pathIndex !== undefined) {
return { resultIndex };
} else {
return key;
}
case NavigationDirection.right:
if (pathIndex === undefined) {
return { resultIndex, pathIndex: 0 };
} else if (pathNodeIndex === undefined) {
return { resultIndex, pathIndex, pathNodeIndex: 0 };
} else {
return key;
}
}
}
private handleNavigationEvent(event: NavigateMsg) {
this.setState((prevState) => {
const key = this.getNewSelection(prevState.selectedItem, event.direction);
@@ -177,49 +220,6 @@ export class AlertTable extends React.Component<
});
}
private getNewSelection(
key: Keys.ResultKey | undefined,
direction: NavigationDirection,
): Keys.ResultKey {
if (key === undefined) {
return { resultIndex: 0 };
}
const { resultIndex, pathIndex, pathNodeIndex } = key;
switch (direction) {
case NavigationDirection.up:
case NavigationDirection.down: {
const delta = direction === NavigationDirection.up ? -1 : 1;
if (key.pathNodeIndex !== undefined) {
return {
resultIndex,
pathIndex: key.pathIndex,
pathNodeIndex: key.pathNodeIndex + delta,
};
} else if (pathIndex !== undefined) {
return { resultIndex, pathIndex: pathIndex + delta };
} else {
return { resultIndex: resultIndex + delta };
}
}
case NavigationDirection.left:
if (key.pathNodeIndex !== undefined) {
return { resultIndex, pathIndex: key.pathIndex };
} else if (pathIndex !== undefined) {
return { resultIndex };
} else {
return key;
}
case NavigationDirection.right:
if (pathIndex === undefined) {
return { resultIndex, pathIndex: 0 };
} else if (pathNodeIndex === undefined) {
return { resultIndex, pathIndex, pathNodeIndex: 0 };
} else {
return key;
}
}
}
componentDidUpdate() {
this.scroller.update();
}