aboutsummaryrefslogtreecommitdiffstats
path: root/subprojects/frontend/src/xtext/xtextServiceResults.ts
diff options
context:
space:
mode:
Diffstat (limited to 'subprojects/frontend/src/xtext/xtextServiceResults.ts')
-rw-r--r--subprojects/frontend/src/xtext/xtextServiceResults.ts5
1 files changed, 3 insertions, 2 deletions
diff --git a/subprojects/frontend/src/xtext/xtextServiceResults.ts b/subprojects/frontend/src/xtext/xtextServiceResults.ts
index 4cfb9c33..e93c6714 100644
--- a/subprojects/frontend/src/xtext/xtextServiceResults.ts
+++ b/subprojects/frontend/src/xtext/xtextServiceResults.ts
@@ -26,12 +26,13 @@ export type ServiceConflictResult = z.infer<typeof ServiceConflictResult>;
26 26
27export function isConflictResult( 27export function isConflictResult(
28 result: unknown, 28 result: unknown,
29 conflictType: Conflict, 29 conflictType?: Conflict | undefined,
30): boolean { 30): boolean {
31 const parsedConflictResult = ServiceConflictResult.safeParse(result); 31 const parsedConflictResult = ServiceConflictResult.safeParse(result);
32 return ( 32 return (
33 parsedConflictResult.success && 33 parsedConflictResult.success &&
34 parsedConflictResult.data.conflict === conflictType 34 (conflictType === undefined ||
35 parsedConflictResult.data.conflict === conflictType)
35 ); 36 );
36} 37}
37 38