Skip to content

Commit 54e1b29

Browse files
committed
Add explicit return type to convertToLegacyModeledMethod
1 parent b763693 commit 54e1b29

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

extensions/ql-vscode/src/model-editor/method-modeling/method-modeling-view-provider.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,13 @@ export class MethodModelingViewProvider extends AbstractWebviewViewProvider<
150150
if (this.webviewView && e.isActiveDb) {
151151
const modeledMethods = e.modeledMethods[this.method?.signature ?? ""];
152152
if (modeledMethods) {
153-
await this.postMessage({
154-
t: "setModeledMethod",
155-
method: convertToLegacyModeledMethod(modeledMethods),
156-
});
153+
const modeledMethod = convertToLegacyModeledMethod(modeledMethods);
154+
if (modeledMethod) {
155+
await this.postMessage({
156+
t: "setModeledMethod",
157+
method: modeledMethod,
158+
});
159+
}
157160
}
158161
}
159162
}),

extensions/ql-vscode/src/model-editor/modeled-methods-legacy.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,15 @@ export function convertToLegacyModeledMethods(
3737
): Record<string, ModeledMethod> {
3838
// Always take the first modeled method in the array
3939
return Object.fromEntries(
40-
Object.entries(modeledMethods).map(([signature, modeledMethods]) => {
41-
return [signature, convertToLegacyModeledMethod(modeledMethods)];
42-
}),
40+
Object.entries(modeledMethods)
41+
.map(([signature, modeledMethods]) => {
42+
const modeledMethod = convertToLegacyModeledMethod(modeledMethods);
43+
if (!modeledMethod) {
44+
return null;
45+
}
46+
return [signature, modeledMethod];
47+
})
48+
.filter((entry): entry is [string, ModeledMethod] => entry !== null),
4349
);
4450
}
4551

@@ -66,6 +72,8 @@ export function convertFromLegacyModeledMethod(modeledMethod: ModeledMethod) {
6672
*
6773
* @param modeledMethods The ModeledMethod[]
6874
*/
69-
export function convertToLegacyModeledMethod(modeledMethods: ModeledMethod[]) {
75+
export function convertToLegacyModeledMethod(
76+
modeledMethods: ModeledMethod[],
77+
): ModeledMethod | undefined {
7078
return modeledMethods[0];
7179
}

0 commit comments

Comments
 (0)