Update VSCode engine and notebook scheme (#11701)

DonJayamanne · web-flow · commit e9a8d0abe511 · 2020-05-12T09:56:28.000-07:00
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
         "theme": "dark"
     },
     "engines": {
-        "vscode": "^1.43.0"
+        "vscode": "^1.45.0"
     },
     "keywords": [
         "python",
diff --git a/src/client/activation/common/analysisOptions.ts b/src/client/activation/common/analysisOptions.ts
@@ -4,7 +4,7 @@ import { injectable } from 'inversify';
 import { Disposable, Event, EventEmitter, WorkspaceFolder } from 'vscode';
 import { DocumentFilter, LanguageClientOptions, RevealOutputChannelOn } from 'vscode-languageclient';
 
-import { PYTHON_LANGUAGE } from '../../common/constants';
+import { PYTHON, PYTHON_LANGUAGE } from '../../common/constants';
 import { traceDecorators } from '../../common/logger';
 import { IOutputChannel, Resource } from '../../common/types';
 import { debounceSync } from '../../common/utils/decorators';
@@ -62,10 +62,7 @@ export abstract class LanguageServerAnalysisOptionsBase implements ILanguageServ
     }
 
     protected getDocumentFilters(_workspaceFolder?: WorkspaceFolder): DocumentFilter[] {
-        return [
-            { scheme: 'file', language: PYTHON_LANGUAGE },
-            { scheme: 'untitled', language: PYTHON_LANGUAGE }
-        ];
+        return PYTHON;
     }
 
     // tslint:disable-next-line: no-any
diff --git a/src/client/common/constants.ts b/src/client/common/constants.ts
@@ -1,14 +1,13 @@
-import { DocumentFilter } from 'vscode';
-
 export const PYTHON_LANGUAGE = 'python';
-
+export const MARKDOWN_LANGUAGE = 'markdown';
 export const JUPYTER_LANGUAGE = 'jupyter';
 
 export const PYTHON_WARNINGS = 'PYTHONWARNINGS';
 
-export const PYTHON: DocumentFilter[] = [
+export const PYTHON = [
     { scheme: 'file', language: PYTHON_LANGUAGE },
-    { scheme: 'untitled', language: PYTHON_LANGUAGE }
+    { scheme: 'untitled', language: PYTHON_LANGUAGE },
+    { scheme: 'vscode-notebook', language: PYTHON_LANGUAGE }
 ];
 export const PYTHON_ALLFILES = [{ language: PYTHON_LANGUAGE }];
 
diff --git a/src/test/activation/languageServer/analysisOptions.unit.test.ts b/src/test/activation/languageServer/analysisOptions.unit.test.ts
@@ -210,7 +210,8 @@ suite('Language Server - Analysis Options', () => {
 
         const expectedSelector = [
             { scheme: 'file', language: PYTHON_LANGUAGE },
-            { scheme: 'untitled', language: PYTHON_LANGUAGE }
+            { scheme: 'untitled', language: PYTHON_LANGUAGE },
+            { scheme: 'vscode-notebook', language: PYTHON_LANGUAGE }
         ];
 
         const selector = analysisOptions.getDocumentFilters();
@@ -223,7 +224,8 @@ suite('Language Server - Analysis Options', () => {
 
         const expectedSelector = [
             { scheme: 'file', language: PYTHON_LANGUAGE },
-            { scheme: 'untitled', language: PYTHON_LANGUAGE }
+            { scheme: 'untitled', language: PYTHON_LANGUAGE },
+            { scheme: 'vscode-notebook', language: PYTHON_LANGUAGE }
         ];
 
         const selector = analysisOptions.getDocumentFilters(workspaceFolder);
@@ -237,7 +239,8 @@ suite('Language Server - Analysis Options', () => {
 
         const expectedSelector = [
             { scheme: 'file', language: PYTHON_LANGUAGE, pattern: `${workspaceFolder1.uri.fsPath}/**/*` },
-            { scheme: 'untitled', language: PYTHON_LANGUAGE }
+            { scheme: 'untitled', language: PYTHON_LANGUAGE },
+            { scheme: 'vscode-notebook', language: PYTHON_LANGUAGE }
         ];
 
         const selector = analysisOptions.getDocumentFilters(workspaceFolder1);
diff --git a/tsconfig.json b/tsconfig.json
@@ -7,7 +7,7 @@
         "module": "commonjs",
         "target": "es2018",
         "outDir": "out",
-        "lib": ["es6", "es2018", "dom"],
+        "lib": ["es6", "es2018", "dom", "ES2019"],
         "jsx": "react",
         "sourceMap": true,
         "rootDir": "src",
