瀏覽代碼

Bump the TypeScript version, and fix the changes to the monaco API

Orta Therox 5 年之前
父節點
當前提交
05f3891fd1
共有 4 個文件被更改,包括 7 次插入6 次删除
  1. 1 0
      .github/workflows/ci.yml
  2. 3 3
      package-lock.json
  3. 1 1
      package.json
  4. 2 2
      src/languageFeatures.ts

+ 1 - 0
.github/workflows/ci.yml

@@ -12,3 +12,4 @@ jobs:
           node-version: '10.x'
           node-version: '10.x'
       - run: npm install
       - run: npm install
       - run: npm run compile
       - run: npm run compile
+      - run: npm run prepublishOnly

+ 3 - 3
package-lock.json

@@ -79,9 +79,9 @@
       }
       }
     },
     },
     "typescript": {
     "typescript": {
-      "version": "3.7.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.5.tgz",
-      "integrity": "sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==",
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz",
+      "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==",
       "dev": true
       "dev": true
     }
     }
   }
   }

+ 1 - 1
package.json

@@ -25,6 +25,6 @@
     "monaco-plugin-helpers": "^1.0.2",
     "monaco-plugin-helpers": "^1.0.2",
     "requirejs": "^2.3.6",
     "requirejs": "^2.3.6",
     "terser": "^4.6.3",
     "terser": "^4.6.3",
-    "typescript": "^3.7.5"
+    "typescript": "^3.8.2"
   }
   }
 }
 }

+ 2 - 2
src/languageFeatures.ts

@@ -691,7 +691,7 @@ export class FormatOnTypeAdapter extends FormatHelper implements monaco.language
 
 
 export class CodeActionAdaptor extends FormatHelper implements monaco.languages.CodeActionProvider {
 export class CodeActionAdaptor extends FormatHelper implements monaco.languages.CodeActionProvider {
 
 
-	public async provideCodeActions(model: monaco.editor.ITextModel, range: Range, context: monaco.languages.CodeActionContext, token: CancellationToken): Promise<monaco.languages.CodeActionList | undefined> {
+	public async provideCodeActions(model: monaco.editor.ITextModel, range: Range, context: monaco.languages.CodeActionContext, token: CancellationToken): Promise<monaco.languages.CodeActionList> {
 		const resource = model.uri;
 		const resource = model.uri;
 		const start = model.getOffsetAt({ lineNumber: range.startLineNumber, column: range.startColumn });
 		const start = model.getOffsetAt({ lineNumber: range.startLineNumber, column: range.startColumn });
 		const end = model.getOffsetAt({ lineNumber: range.endLineNumber, column: range.endColumn });
 		const end = model.getOffsetAt({ lineNumber: range.endLineNumber, column: range.endColumn });
@@ -701,7 +701,7 @@ export class CodeActionAdaptor extends FormatHelper implements monaco.languages.
 		const codeFixes = await worker.getCodeFixesAtPosition(resource.toString(), start, end, errorCodes, formatOptions);
 		const codeFixes = await worker.getCodeFixesAtPosition(resource.toString(), start, end, errorCodes, formatOptions);
 
 
 		if (!codeFixes || model.isDisposed()) {
 		if (!codeFixes || model.isDisposed()) {
-			return;
+			return { actions: [], dispose:() => {} };
 		}
 		}
 
 
 		const actions = codeFixes.filter(fix => {
 		const actions = codeFixes.filter(fix => {