Merge upstream (#3)

pgherveou · Feb 5, 2021 · 2060627 · 2060627
1 parent ffdecfb
commit 2060627
Show file tree

Hide file tree

Showing 11 changed files with 301 additions and 134 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,5 +1,5 @@
 name: 'CI'
-on: [pull_request]
+on: [push, pull_request]
 jobs:
   build:
     name: 'Builds and Compiles'

diff --git a/monaco.d.ts b/monaco.d.ts
@@ -19,7 +19,9 @@ declare namespace monaco.languages.typescript {
 		None = 0,
 		Preserve = 1,
 		React = 2,
-		ReactNative = 3
+		ReactNative = 3,
+		ReactJSX = 4,
+		ReactJSXDev = 5
 	}
 	export enum NewLineKind {
 		CarriageReturnLineFeed = 0,
@@ -303,7 +305,11 @@ declare namespace monaco.languages.typescript {
 		 * Get signature help items for the item at the given file and position.
 		 * @returns `Promise<typescript.SignatureHelpItems | undefined>`
 		 */
-		getSignatureHelpItems(fileName: string, position: number): Promise<any | undefined>;
+		getSignatureHelpItems(
+			fileName: string,
+			position: number,
+			options: any
+		): Promise<any | undefined>;
 		/**
 		 * Get quick info for the item at the given position in the file.
 		 * @returns `Promise<typescript.QuickInfo | undefined>`