Add ILSPCodeOverridesManager, move implementations to transclusions/

Author: krassowski

packages/jupyterlab-lsp/src/adapters/adapter.ts

@@ -128,6 +128,10 @@ export abstract class WidgetAdapter<T extends IDocumentWidget> {
     return this.extension.foreign_code_extractors;
   }
 
+  protected get code_overrides() {
+    return this.extension.code_overrides;
+  }
+
   on_connection_closed(
     manager: DocumentConnectionManager,
     { virtual_document }: IDocumentConnectionData

packages/jupyterlab-lsp/src/adapters/notebook/notebook.ts

@@ -1,7 +1,6 @@
 import { WidgetAdapter } from '../adapter';
 import { Notebook, NotebookPanel } from '@jupyterlab/notebook';
 import { until_ready } from '../../utils';
-import { language_specific_overrides } from '../../magics/defaults';
 import { Cell } from '@jupyterlab/cells';
 import * as nbformat from '@jupyterlab/nbformat';
 import ILanguageInfoMetadata = nbformat.ILanguageInfoMetadata;
@@ -160,7 +159,7 @@ export class NotebookAdapter extends WidgetAdapter<NotebookPanel> {
     return new VirtualDocument({
       language: this.language,
       path: this.document_path,
-      overrides_registry: language_specific_overrides,
+      overrides_registry: this.code_overrides,
       foreign_code_extractors: this.foreign_code_extractors,
       file_extension: this.language_file_extension,
       // notebooks are continuous, each cell is dependent on the previous one

packages/jupyterlab-lsp/src/editor_integration/feature.spec.ts

@@ -9,8 +9,8 @@ import {
 } from './testutils';
 import * as lsProtocol from 'vscode-languageserver-protocol';
 import * as nbformat from '@jupyterlab/nbformat';
-import { language_specific_overrides } from '../magics/defaults';
-import { foreign_code_extractors } from '../extractors/ipython';
+import { overrides } from '../transclusions/ipython/overrides';
+import { foreign_code_extractors } from '../transclusions/ipython/extractors';
 import { NotebookModel } from '@jupyterlab/notebook';
 import { PageConfig } from '@jupyterlab/coreutils';
 import { CodeMirrorIntegration } from './codemirror';
@@ -183,7 +183,12 @@ describe('Feature', () => {
 
       beforeEach(() => {
         environment = new NotebookFeatureTestEnvironment({
-          overrides_registry: language_specific_overrides,
+          overrides_registry: {
+            python: {
+              cell: overrides.filter(override => override.scope == 'cell'),
+              line: overrides.filter(override => override.scope == 'line')
+            }
+          },
           foreign_code_extractors: foreign_code_extractors
         });
 

packages/jupyterlab-lsp/src/editor_integration/testutils.ts

@@ -45,6 +45,7 @@ import { FeatureManager, ILSPExtension } from '../index';
 import { JupyterFrontEnd } from '@jupyterlab/application';
 import { IFeatureSettings } from '../feature';
 import { IForeignCodeExtractorsRegistry } from '../extractors/types';
+import { ICodeOverridesRegistry } from '../overrides/tokens';
 
 export interface ITestEnvironment {
   document_options: VirtualDocument.IOptions;
@@ -90,6 +91,7 @@ export class MockExtension implements ILSPExtension {
   feature_manager: ILSPFeatureManager;
   editor_type_manager: ILSPVirtualEditorManager;
   foreign_code_extractors: IForeignCodeExtractorsRegistry;
+  code_overrides: ICodeOverridesRegistry;
 
   constructor() {
     this.app = null;
@@ -105,6 +107,7 @@ export class MockExtension implements ILSPExtension {
       supports: CodeMirrorEditor
     });
     this.foreign_code_extractors = {};
+    this.code_overrides = {};
   }
 }
 

packages/jupyterlab-lsp/src/extractors/defaults.ts

@@ -1,6 +1,6 @@
 import { IExtractedCode, IForeignCodeExtractor } from './types';
 import { position_at_offset } from '../positioning';
-import { replacer } from '../magics/overrides';
+import { replacer } from '../overrides/tokens';
 import { CodeEditor } from '@jupyterlab/codeeditor';
 
 export class RegExpForeignCodeExtractor implements IForeignCodeExtractor {

packages/jupyterlab-lsp/src/extractors/regexp.ts

@@ -15,8 +15,7 @@ import {
 } from '../../editor_integration/testutils';
 import { CodeMirrorEditor } from '@jupyterlab/codemirror';
 import { is_equal } from '../../positioning';
-import { language_specific_overrides } from '../../magics/defaults';
-import { foreign_code_extractors } from '../../extractors/ipython';
+import { foreign_code_extractors } from '../../transclusions/ipython/extractors';
 import * as lsProtocol from 'vscode-languageserver-protocol';
 import { CodeDiagnostics as LSPDiagnosticsSettings } from '../../_diagnostics';
 
@@ -144,7 +143,7 @@ describe('Diagnostics', () => {
 
     beforeEach(() => {
       env = new NotebookFeatureTestEnvironment({
-        overrides_registry: language_specific_overrides,
+        overrides_registry: {},
         foreign_code_extractors
       });
       feature = env.init_integration({

packages/jupyterlab-lsp/src/features/diagnostics/diagnostics.spec.ts

@@ -38,7 +38,11 @@ import { DIAGNOSTICS_PLUGIN } from './features/diagnostics';
 import { COMPLETION_PLUGIN } from './features/completion';
 import { CODE_EXTRACTORS_MANAGER } from './extractors/manager';
 import { IForeignCodeExtractorsRegistry } from './extractors/types';
-import { DEFAULT_CODE_EXTRACTORS } from './extractors/defaults';
+import {
+  ILSPCodeOverridesManager,
+  ICodeOverridesRegistry
+} from './overrides/tokens';
+import { DEFAULT_TRANSCLUSIONS } from './transclusions/defaults';
 
 export const codeCheckIcon = new LabIcon({
   name: 'lsp:codeCheck',
@@ -103,6 +107,7 @@ export interface ILSPExtension {
   feature_manager: ILSPFeatureManager;
   editor_type_manager: ILSPVirtualEditorManager;
   foreign_code_extractors: IForeignCodeExtractorsRegistry;
+  code_overrides: ICodeOverridesRegistry;
 }
 
 export class LSPExtension implements ILSPExtension {
@@ -119,7 +124,8 @@ export class LSPExtension implements ILSPExtension {
     status_bar: IStatusBar,
     adapterManager: ILSPAdapterManager,
     public editor_type_manager: ILSPVirtualEditorManager,
-    private code_extractors_manager: ILSPCodeExtractorsManager
+    private code_extractors_manager: ILSPCodeExtractorsManager,
+    private code_overrides_manager: ILSPCodeOverridesManager
   ) {
     this.language_server_manager = new LanguageServerManager({});
     this.connection_manager = new DocumentConnectionManager({
@@ -175,6 +181,10 @@ export class LSPExtension implements ILSPExtension {
     return this.code_extractors_manager.registry;
   }
 
+  get code_overrides() {
+    return this.code_overrides_manager.registry;
+  }
+
   private updateOptions(settings: ISettingRegistry.ISettings) {
     const options = settings.composite;
 
@@ -197,7 +207,8 @@ const plugin: JupyterFrontEndPlugin<ILSPFeatureManager> = {
     IStatusBar,
     ILSPAdapterManager,
     ILSPVirtualEditorManager,
-    ILSPCodeExtractorsManager
+    ILSPCodeExtractorsManager,
+    ILSPCodeOverridesManager
   ],
   activate: (app, ...args) => {
     let extension = new LSPExtension(
@@ -210,7 +221,8 @@ const plugin: JupyterFrontEndPlugin<ILSPFeatureManager> = {
         IStatusBar,
         ILSPAdapterManager,
         ILSPVirtualEditorManager,
-        ILSPCodeExtractorsManager
+        ILSPCodeExtractorsManager,
+        ILSPCodeOverridesManager
       ])
     );
     return extension.feature_manager;
@@ -237,7 +249,7 @@ const plugins: JupyterFrontEndPlugin<any>[] = [
   VIRTUAL_EDITOR_MANAGER,
   CODEMIRROR_VIRTUAL_EDITOR,
   plugin,
-  ...DEFAULT_CODE_EXTRACTORS,
+  ...DEFAULT_TRANSCLUSIONS,
   ...default_features
 ];