get jest to run

bollwyvl · bollwyvl · commit 78590ca2a834 · 2020-11-04T14:34:58.000-05:00
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^3.10.1",
     "@typescript-eslint/parser": "^3.10.1",
-    "bash-language-server": "^1.6.1",
+    "bash-language-server": "^1.17.0",
     "dictionary-en": "^3.0.0",
     "dockerfile-language-server-nodejs": "^0.0.22",
     "eslint": "^7.5.0",
@@ -24,7 +24,8 @@
     "vscode-css-languageserver-bin": "^1.4.0",
     "vscode-html-languageserver-bin": "^1.4.0",
     "vscode-json-languageserver-bin": "^1.0.1",
-    "yaml-language-server": "^0.11.1"
+    "yaml-language-server": "^0.12.0",
+    "vscode-json-languageservice": "^3.9.1 <3.10.0"
   },
   "husky": {
     "hooks": {}
diff --git a/packages/jupyterlab-go-to-definition/jest.config.js b/packages/jupyterlab-go-to-definition/jest.config.js
@@ -10,7 +10,7 @@ const reuseFromUpstream = [
 ];
 
 let local = {
-  globals: { 'ts-jest': { tsConfig: 'tsconfig.json' } },
+  globals: { 'ts-jest': { tsconfig: 'tsconfig.json' } },
   testRegex: `.*\.spec\.tsx?$`,
   transform: {
     '\\.(ts|tsx)?$': 'ts-jest',
diff --git a/packages/jupyterlab-go-to-definition/package.json b/packages/jupyterlab-go-to-definition/package.json
@@ -50,7 +50,7 @@
     "@jupyterlab/apputils": "~2.2.0",
     "@jupyterlab/codeeditor": "~2.2.0",
     "@jupyterlab/codemirror": "~2.2.0",
-    "@jupyterlab/coreutils": "~4.0.0",
+    "@jupyterlab/coreutils": "~4.2.0",
     "@jupyterlab/docmanager": "~2.2.0",
     "@jupyterlab/docregistry": "~2.2.0",
     "@jupyterlab/fileeditor": "~2.2.0",
@@ -65,11 +65,11 @@
     "@types/chai": "^4.1.7",
     "@types/jest": "^23.3.11",
     "chai": "^4.2.0",
-    "jest": "^24.7.1",
+    "jest": "^26.0.0",
     "jest-junit": "^8.0.0",
     "rimraf": "^2.6.1",
-    "ts-jest": "^24.0.2",
-    "typescript": "~3.9.5",
+    "ts-jest": "^26.4.3",
+    "typescript": "~4.0.2",
     "@babel/preset-env": "^7.4.3"
   },
   "jupyterlab": {
diff --git a/packages/jupyterlab-lsp/jest.config.js b/packages/jupyterlab-lsp/jest.config.js
@@ -10,7 +10,7 @@ const reuseFromUpstream = [
 ];
 
 let local = {
-  globals: { 'ts-jest': { tsConfig: 'tsconfig.json' } },
+  globals: { 'ts-jest': { tsconfig: 'tsconfig.json' } },
   testRegex: `.*\.spec\.tsx?$`,
   transform: {
     '\\.(ts|tsx)?$': 'ts-jest',
diff --git a/packages/jupyterlab-lsp/package.json b/packages/jupyterlab-lsp/package.json
@@ -76,13 +76,13 @@
     "chai": "^4.2.0",
     "codemirror": "*",
     "events": "^3.0.0",
-    "jest": "^24.7.1",
+    "jest": "^26.0.0",
     "jest-junit": "^8.0.0",
     "json-schema-to-typescript": "^8.0.0",
     "react": "*",
     "rimraf": "~2.6.2",
-    "ts-jest": "^24.0.2",
-    "typescript": "~3.9.5"
+    "ts-jest": "^26.4.3",
+    "typescript": "~4.0.2"
   },
   "peerDependencies": {
     "@jupyterlab/application": "~2.2.0",
diff --git a/packages/jupyterlab-lsp/src/editor_integration/codemirror.ts b/packages/jupyterlab-lsp/src/editor_integration/codemirror.ts
@@ -15,7 +15,7 @@ import {
 } from '../positioning';
 import * as lsProtocol from 'vscode-languageserver-protocol';
 import { PositionConverter } from '../converter';
-import { DefaultMap } from '../utils';
+import { DefaultMap, uris_equal } from '../utils';
 import { CodeEditor } from '@jupyterlab/codeeditor';
 import {
   CodeMirrorHandler,
@@ -279,10 +279,7 @@ export abstract class CodeMirrorIntegration
     for (let change of changes) {
       let uri = change.textDocument.uri;
 
-      if (
-        decodeURI(uri) !== decodeURI(current_uri) &&
-        decodeURI(uri) !== '/' + decodeURI(current_uri)
-      ) {
+      if (!uris_equal(uri, current_uri)) {
         errors.push(
           'Workspace-wide edits not implemented (' +
             decodeURI(uri) +
diff --git a/packages/jupyterlab-lsp/src/editor_integration/feature.spec.ts b/packages/jupyterlab-lsp/src/editor_integration/feature.spec.ts
@@ -118,7 +118,7 @@ describe('Feature', () => {
 
         let outcome = await feature.do_apply_edit({
           changes: {
-            ['file://' + environment.document_options.path]: [
+            ['file:///' + environment.document_options.path]: [
               {
                 range: {
                   start: { line: 0, character: 0 },
@@ -145,7 +145,7 @@ describe('Feature', () => {
 
         let outcome = await feature.do_apply_edit({
           changes: {
-            ['file://' + environment.document_options.path]: []
+            ['file:///' + environment.document_options.path]: []
           }
         });
         let raw_value = environment.ce_editor.doc.getValue();
@@ -162,7 +162,7 @@ describe('Feature', () => {
 
         let result = await feature.do_apply_edit({
           changes: {
-            ['file://' + environment.document_options.path]: js_partial_edits
+            ['file:///' + environment.document_options.path]: js_partial_edits
           }
         });
         let raw_value = environment.ce_editor.doc.getValue();
diff --git a/packages/jupyterlab-lsp/src/features/completion/completion.ts b/packages/jupyterlab-lsp/src/features/completion/completion.ts
@@ -22,7 +22,10 @@ import { ILSPCompletionThemeManager } from '@krassowski/completion-theme/lib/typ
 
 export class CompletionCM extends CodeMirrorIntegration {
   private _completionCharacters: string[];
-  settings: FeatureSettings<LSPCompletionSettings>;
+
+  get settings() {
+    return super.settings as FeatureSettings<LSPCompletionSettings>;
+  }
 
   get completionCharacters() {
     if (
diff --git a/packages/jupyterlab-lsp/src/features/diagnostics/diagnostics.ts b/packages/jupyterlab-lsp/src/features/diagnostics/diagnostics.ts
@@ -265,9 +265,12 @@ export const diagnostics_databases = new WeakMap<
 >();
 
 export class DiagnosticsCM extends CodeMirrorIntegration {
-  settings: FeatureSettings<LSPDiagnosticsSettings>;
   private last_response: lsProtocol.PublishDiagnosticsParams;
 
+  get settings() {
+    return super.settings as FeatureSettings<LSPDiagnosticsSettings>;
+  }
+
   register(): void {
     this.connection_handlers.set('diagnostic', this.handleDiagnostic);
     this.wrapper_handlers.set('focusin', this.switchDiagnosticsPanelSource);
diff --git a/packages/jupyterlab-lsp/src/features/hover.ts b/packages/jupyterlab-lsp/src/features/hover.ts
@@ -81,8 +81,6 @@ export class HoverCM extends CodeMirrorIntegration {
   private last_hover_response: lsProtocol.Hover;
   protected hover_marker: CodeMirror.TextMarker;
   private virtual_position: IVirtualPosition;
-  lab_integration: HoverLabIntegration;
-  settings: FeatureSettings<LSPHoverSettings>;
   protected cache: ResponseCache;
 
   private debounced_get_hover: Throttler<Promise<lsProtocol.Hover>>;
@@ -92,6 +90,14 @@ export class HoverCM extends CodeMirrorIntegration {
     return this.settings.composite.modifierKey;
   }
 
+  get lab_integration() {
+    return super.lab_integration as HoverLabIntegration;
+  }
+
+  get settings() {
+    return super.settings as FeatureSettings<LSPHoverSettings>;
+  }
+
   protected restore_from_cache(
     document: VirtualDocument,
     virtual_position: IVirtualPosition
diff --git a/packages/jupyterlab-lsp/src/features/rename.spec.ts b/packages/jupyterlab-lsp/src/features/rename.spec.ts
@@ -34,7 +34,7 @@ describe('Rename', () => {
       await feature.handleRename(
         {
           changes: {
-            ['file://' + env.document_options.path]: [
+            ['file:///' + env.document_options.path]: [
               {
                 range: {
                   start: { line: 0, character: 0 },
diff --git a/packages/jupyterlab-lsp/src/features/signature.ts b/packages/jupyterlab-lsp/src/features/signature.ts
@@ -15,7 +15,10 @@ import { IEditorChange } from '../virtual/editor';
 export class SignatureCM extends CodeMirrorIntegration {
   protected signature_character: IRootPosition;
   protected _signatureCharacters: string[];
-  lab_integration: SignatureLabIntegration;
+
+  get lab_integration() {
+    return super.lab_integration as SignatureLabIntegration;
+  }
 
   protected get_markup_for_signature_help(
     response: lsProtocol.SignatureHelp,
diff --git a/packages/jupyterlab-lsp/src/features/syntax_highlighting.ts b/packages/jupyterlab-lsp/src/features/syntax_highlighting.ts
@@ -27,8 +27,6 @@ export const syntaxHighlightingIcon = new LabIcon({
 const FEATURE_ID = PLUGIN_ID + ':syntax_highlighting';
 
 export class CMSyntaxHighlighting extends CodeMirrorIntegration {
-  lab_integration: SyntaxLabIntegration;
-  settings: IFeatureSettings<LSPSyntaxHighlightingSettings>;
   editors_with_active_highlight: Set<CodeMirrorEditor>;
 
   constructor(options: IEditorIntegrationOptions) {
@@ -37,6 +35,14 @@ export class CMSyntaxHighlighting extends CodeMirrorIntegration {
     this.editors_with_active_highlight = new Set();
   }
 
+  get lab_integration() {
+    return super.lab_integration as SyntaxLabIntegration;
+  }
+
+  get settings() {
+    return super.settings as IFeatureSettings<LSPSyntaxHighlightingSettings>;
+  }
+
   private get_mode(language: string) {
     let mimetype = this.lab_integration.mimeTypeService.getMimeTypeByLanguage({
       name: language
diff --git a/packages/lsp-ws-connection/package.json b/packages/lsp-ws-connection/package.json
@@ -54,7 +54,7 @@
     "rimraf": "^2.6.3",
     "sinon": "^7.3.2",
     "source-map-loader": "~0.2.1",
-    "typescript": "~3.9.5",
+    "typescript": "~4.0.2",
     "webpack": "^4.32.2",
     "webpack-cli": "^3.3.0"
   }
diff --git a/packages/metapackage/package.json b/packages/metapackage/package.json
@@ -37,7 +37,7 @@
     "fs-extra": "^8.0.1",
     "rimraf": "~2.6.2",
     "typedoc": "^0.14.2",
-    "typescript": "~3.9.5"
+    "typescript": "~4.0.2"
   },
   "publishConfig": {
     "access": "public"
