Combine the union of ErrorHandlers into common attribute name (#320)

microsoft · Jun 9, 2022 · f3feb93 · f3feb93
1 parent a92fdcf
commit f3feb93
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@microsoft/powerquery-parser",
-    "version": "0.9.0",
+    "version": "0.9.1",
     "description": "A parser for the Power Query/M formula language.",
     "author": "Microsoft",
     "license": "MIT",

diff --git a/src/powerquery-parser/language/ast/ast.ts b/src/powerquery-parser/language/ast/ast.ts
@@ -561,21 +561,21 @@ export const enum ErrorHandlerKind {
     Otherwise = "Otherwise",
 }
 
-export interface IErrorHandlingExpression<T extends ErrorHandlerKind> extends INode {
+export interface IErrorHandlingExpression<K extends ErrorHandlerKind, H> extends INode {
     readonly kind: NodeKind.ErrorHandlingExpression;
-    readonly handlerKind: T;
+    readonly handlerKind: K;
     readonly isLeaf: false;
     readonly tryConstant: IConstant<Constant.KeywordConstant.Try>;
     readonly protectedExpression: TExpression;
+    readonly maybeHandler: H | undefined;
 }
 
-export interface ErrorHandlingCatchExpression extends IErrorHandlingExpression<ErrorHandlerKind.Catch> {
-    readonly catchExpression: CatchExpression;
-}
+export type ErrorHandlingCatchExpression = IErrorHandlingExpression<ErrorHandlerKind.Catch, CatchExpression>;
 
-export interface ErrorHandlingOtherwiseExpression extends IErrorHandlingExpression<ErrorHandlerKind.Otherwise> {
-    readonly maybeOtherwiseExpression: OtherwiseExpression | undefined;
-}
+export type ErrorHandlingOtherwiseExpression = IErrorHandlingExpression<
+    ErrorHandlerKind.Otherwise,
+    OtherwiseExpression
+>;
 
 export type TErrorHandlingExpression = ErrorHandlingCatchExpression | ErrorHandlingOtherwiseExpression;
 

diff --git a/src/powerquery-parser/parser/parsers/naive.ts b/src/powerquery-parser/parser/parsers/naive.ts
@@ -2716,7 +2716,7 @@ export async function readErrorHandlingExpression(
             isLeaf: false,
             tryConstant,
             protectedExpression,
-            catchExpression,
+            maybeHandler: catchExpression,
         };
 
         result = errorHandlingCatchExpression;
@@ -2745,7 +2745,7 @@ export async function readErrorHandlingExpression(
             isLeaf: false,
             tryConstant,
             protectedExpression,
-            maybeOtherwiseExpression,
+            maybeHandler: maybeOtherwiseExpression,
         };
 
         result = errorHandlingOtherwiseExpression;