Improve Monarch types (microsoft#164432)

alexdima · web-flow · commit eac7dda3894f · 2022-10-24T15:11:36.000+03:00
Fixes microsoft#164390: Improve Monarch types
diff --git a/src/vs/editor/standalone/common/monarch/monarchTypes.ts b/src/vs/editor/standalone/common/monarch/monarchTypes.ts
@@ -127,10 +127,7 @@ export interface IExpandedMonarchLanguageAction {
 	log?: string;
 }
 
-export type IMonarchLanguageAction = IShortMonarchLanguageAction
-	| IExpandedMonarchLanguageAction
-	| IShortMonarchLanguageAction[]
-	| IExpandedMonarchLanguageAction[];
+export type IMonarchLanguageAction = IShortMonarchLanguageAction | IExpandedMonarchLanguageAction | (IShortMonarchLanguageAction | IExpandedMonarchLanguageAction)[];
 
 /**
  * This interface can be shortened as an array, ie. ['{','}','delimiter.curly']
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
@@ -7410,7 +7410,7 @@ declare namespace monaco.languages {
 		log?: string;
 	}
 
-	export type IMonarchLanguageAction = IShortMonarchLanguageAction | IExpandedMonarchLanguageAction | IShortMonarchLanguageAction[] | IExpandedMonarchLanguageAction[];
+	export type IMonarchLanguageAction = IShortMonarchLanguageAction | IExpandedMonarchLanguageAction | (IShortMonarchLanguageAction | IExpandedMonarchLanguageAction)[];
 
 	/**
 	 * This interface can be shortened as an array, ie. ['{','}','delimiter.curly']

Original file line number	Diff line number	Diff line change
`@@ -7410,7 +7410,7 @@ declare namespace monaco.languages {`
`7410`	`7410`	`log?: string;`
`7411`	`7411`	`}`
`7412`	`7412`
`7413`		`- export type IMonarchLanguageAction = IShortMonarchLanguageAction \| IExpandedMonarchLanguageAction \| IShortMonarchLanguageAction[] \| IExpandedMonarchLanguageAction[];`
	`7413`	`+ export type IMonarchLanguageAction = IShortMonarchLanguageAction \| IExpandedMonarchLanguageAction \| (IShortMonarchLanguageAction \| IExpandedMonarchLanguageAction)[];`
`7414`	`7414`
`7415`	`7415`	`/**`
`7416`	`7416`	`* This interface can be shortened as an array, ie. ['{','}','delimiter.curly']`