feat: go to definition

.vscode/settings.json

@@ -43,28 +43,28 @@
     "editor.tabSize": 2,
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
+      "source.fixAll.eslint": "explicit"
     }
   },
   "[typescript]": {
     "editor.tabSize": 2,
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
+      "source.fixAll.eslint": "explicit"
     }
   },
   "[javascriptreact]": {
     "editor.tabSize": 2,
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
+      "source.fixAll.eslint": "explicit"
     }
   },
   "[javascript]": {
     "editor.tabSize": 2,
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
+      "source.fixAll.eslint": "explicit"
     }
   },
   "[json]": {
@@ -89,14 +89,14 @@
     "editor.tabSize": 2,
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.codeActionsOnSave": {
-      "source.fixAll.stylelint": true
+      "source.fixAll.stylelint": "explicit"
     }
   },
   "[less]": {
     "editor.tabSize": 2,
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.codeActionsOnSave": {
-      "source.fixAll.stylelint": true
+      "source.fixAll.stylelint": "explicit"
     }
   },
   "[css][less]": {

packages/libro-cofine-editor/src/libro-e2-editor.ts

@@ -889,8 +889,8 @@ export class LibroE2Editor implements IEditor {
   };
   setCursorPosition = (position: IPosition) => {
     this.monacoEditor?.setPosition({
-      column: position.column,
-      lineNumber: position.line,
+      column: position.column + 1,
+      lineNumber: position.line + 1,
     });
   };
   getSelection = () => {

packages/libro-core/src/cell/libro-cell-model.ts

@@ -1,7 +1,7 @@
 import { Model } from '@difizen/libro-code-editor';
 import type { ICell } from '@difizen/libro-common';
 import { concatMultilineString } from '@difizen/libro-common';
-import { DisposableCollection } from '@difizen/mana-app';
+import { DisposableCollection, watch } from '@difizen/mana-app';
 import { prop, inject, postConstruct, transient } from '@difizen/mana-app';
 
 import type { DefaultDecodedFormatter } from '../formatter/index.js';
@@ -34,6 +34,8 @@ export class LibroCellModel extends Model implements CellModel {
   @prop()
   trusted: boolean;
 
+  version = 0;
+
   constructor(@inject(CellOptions) options: CellOptions) {
     super({
       id: options.cell.id as string,
@@ -68,6 +70,9 @@ export class LibroCellModel extends Model implements CellModel {
       this.libroFormatType,
       formatValue,
     );
+    watch(this, 'value', () => {
+      this.version++;
+    });
   }
 
   get source(): string {

packages/libro-core/src/libro-model.ts

@@ -78,6 +78,8 @@ export class LibroModel implements NotebookModel, DndListModel {
 
   id: string;
 
+  version = 0;
+
   /**
    * The shared notebook model.
    */
@@ -298,6 +300,7 @@ export class LibroModel implements NotebookModel, DndListModel {
   }
 
   onChange() {
+    this.version++;
     this.dirty = true;
     this.onChangedEmitter.fire(true);
   }

packages/libro-core/src/libro-protocol.ts

@@ -71,6 +71,7 @@ export interface ICellContentChange {
 }
 export interface BaseNotebookModel {
   id: string;
+  version: number;
   /**
    * The dirty state of the model.
    * #### Notes
@@ -322,6 +323,8 @@ export interface CellModel extends IModel, Disposable {
    */
   id: string;
 
+  version: number;
+
   source: string;
 
   /**

packages/libro-jupyter/src/cell/jupyter-code-cell-view.tsx

@@ -7,7 +7,7 @@ import type {
   TooltipProviderOption,
 } from '@difizen/libro-code-editor';
 import { KernelError } from '@difizen/libro-kernel';
-import { LibroCellURIScheme } from '@difizen/libro-language-client';
+import { getCellURI } from '@difizen/libro-language-client';
 import { transient, URI } from '@difizen/mana-app';
 import { view, ViewInstance } from '@difizen/mana-app';
 import { getOrigin, useInject } from '@difizen/mana-app';
@@ -55,9 +55,8 @@ export class JupyterCodeCellView extends LibroCodeCellView {
 
   protected override getEditorOption(): CodeEditorViewOptions {
     const options = super.getEditorOption();
-    let uri = new URI(this.parent.model.filePath);
-    uri = URI.withScheme(uri, LibroCellURIScheme);
-    uri = URI.withQuery(uri, `cellid=${this.model.id}`);
+    const uri = getCellURI(this.parent.model, this.model);
+
     return {
       ...options,
       uuid: uri.toString(),

packages/libro-jupyter/src/libro-jupyter-model.ts

@@ -2,13 +2,12 @@ import type { VirtualizedManager } from '@difizen/libro-core';
 import { LibroModel, VirtualizedManagerHelper } from '@difizen/libro-core';
 import {
   ContentsManager,
-  ExecutableNotebookModel,
   isDisplayDataMsg,
   LibroKernelConnectionManager,
   ServerConnection,
   ServerManager,
 } from '@difizen/libro-kernel';
-import type { IKernelConnection } from '@difizen/libro-kernel';
+import type { IKernelConnection, ExecutableNotebookModel } from '@difizen/libro-kernel';
 import type { IContentsCheckpointModel, IContentsModel } from '@difizen/libro-kernel';
 import { getOrigin, ModalService, prop } from '@difizen/mana-app';
 import { Deferred } from '@difizen/mana-app';
@@ -26,17 +25,6 @@ import { getDefaultKernel } from './utils/index.js';
 type IModel = IContentsModel;
 @transient()
 export class LibroJupyterModel extends LibroModel implements ExecutableNotebookModel {
-  static is = (arg: Record<any, any> | undefined): arg is LibroJupyterModel => {
-    return (
-      !!arg &&
-      ExecutableNotebookModel.is(arg) &&
-      'kernelConnection' in arg &&
-      typeof (arg as any).kernelConnection === 'object' &&
-      'lspEnabled' in arg &&
-      typeof (arg as any).lspEnabled === 'boolean'
-    );
-  };
-
   protected libroFileService: LibroFileService;
   protected virtualizedManager: VirtualizedManager;
 

packages/libro-lab/src/lab-app.ts

@@ -33,7 +33,7 @@ export class LibroLabApp implements ApplicationContribution {
   @inject(LayoutService) layoutService: LayoutService;
 
   async onStart() {
-    localStorage.setItem(ShouldPreventStoreViewKey, 'false');
+    localStorage.setItem(ShouldPreventStoreViewKey, 'true');
     this.configurationService.set(
       LibroJupyterConfiguration['OpenSlot'],
       LibroLabLayoutSlots.content,

packages/libro-language-client/package.json

@@ -46,6 +46,7 @@
   },
   "dependencies": {
     "@difizen/libro-core": "^0.1.23",
+    "@difizen/libro-code-editor": "^0.1.23",
     "@difizen/libro-kernel": "^0.1.23",
     "@difizen/libro-common": "^0.1.23",
     "@difizen/libro-lsp": "^0.1.23",

packages/libro-language-client/src/common/codeConverter.ts

@@ -4,6 +4,7 @@
  * ------------------------------------------------------------------------------------------ */
 
 import * as proto from '@difizen/vscode-languageserver-protocol';
+import type { LocationLink } from 'vscode';
 import type {
   InlineCompletionContext,
   InlayHint,
@@ -46,6 +47,8 @@ import type {
   TextEdit,
   Uri,
   SymbolInformation as VSymbolInformation,
+  Definition,
+  DefinitionLink,
 } from 'vscode';
 
 import ProtocolCallHierarchyItem from './protocolCallHierarchyItem.js';
@@ -172,11 +175,25 @@ export interface Converter {
 
   asRanges(values: readonly Range[]): proto.Range[];
 
+  asDefinitionResult(item: Definition): proto.Definition;
+  asDefinitionResult(item: DefinitionLink[]): proto.Definition;
+  asDefinitionResult(item: undefined | null): undefined;
+  asDefinitionResult(
+    item: Definition | DefinitionLink[] | undefined | null,
+  ): proto.Definition | undefined;
+  asDefinitionResult(
+    item: Definition | DefinitionLink[] | undefined | null,
+  ): proto.Definition | undefined;
+
   asLocation(value: null): null;
   asLocation(value: undefined): undefined;
   asLocation(value: Location): proto.Location;
   asLocation(value: Location | undefined | null): proto.Location | undefined | null;
 
+  asLocationLink(item: undefined | null): undefined;
+  asLocationLink(item: LocationLink): proto.LocationLink;
+  asLocationLink(item: LocationLink | undefined | null): proto.LocationLink | undefined;
+
   asDiagnosticSeverity(value: DiagnosticSeverity): number;
   asDiagnosticTag(value: DiagnosticTag): number | undefined;
 
@@ -623,6 +640,63 @@ export function createConverter(uriConverter?: URIConverter): Converter {
     return values.map(asRange as (item: Range) => proto.Range);
   }
 
+  function asLocationLink(item: undefined | null): undefined;
+  function asLocationLink(item: LocationLink): proto.LocationLink;
+  function asLocationLink(
+    item: LocationLink | undefined | null,
+  ): proto.LocationLink | undefined {
+    if (!item) {
+      return undefined;
+    }
+    const result: proto.LocationLink = {
+      targetUri: item.targetUri.toString(),
+      targetRange: asRange(item.targetSelectionRange)!, // See issue: https://github.com/Microsoft/vscode/issues/58649
+      originSelectionRange: asRange(item.originSelectionRange)!,
+      targetSelectionRange: asRange(item.targetSelectionRange)!,
+    };
+    if (!result.targetSelectionRange) {
+      throw new Error(`targetSelectionRange must not be undefined or null`);
+    }
+    return result;
+  }
+
+  // Function to check if an object is a LocationLink
+  function isLocationLink(object: any): object is LocationLink {
+    return (
+      object !== undefined &&
+      'targetUri' in object &&
+      'targetRange' in object &&
+      'targetSelectionRange' in object
+    );
+  }
+
+  function asDefinitionResult(item: Definition): proto.Definition;
+  function asDefinitionResult(item: DefinitionLink[]): proto.Definition;
+  function asDefinitionResult(item: undefined | null): undefined;
+  function asDefinitionResult(
+    item: Definition | DefinitionLink[] | undefined | null,
+  ): proto.Definition | proto.DefinitionLink[] | undefined;
+  function asDefinitionResult(
+    item: Definition | DefinitionLink[] | undefined | null,
+  ): proto.Definition | proto.DefinitionLink[] | undefined {
+    if (!item) {
+      return undefined;
+    }
+    if (Array.isArray(item)) {
+      if (item.length === 0) {
+        return undefined;
+      } else if (isLocationLink(item[0])) {
+        const links: LocationLink[] = item as unknown as LocationLink[];
+        return links.map((location) => asLocationLink(location));
+      } else {
+        const locations: Location[] = item as Location[];
+        return locations.map((location) => asLocation(location));
+      }
+    } else {
+      return asLocation(item);
+    }
+  }
+
   function asLocation(value: Location): proto.Location;
   function asLocation(value: undefined): undefined;
   function asLocation(value: null): null;
@@ -1405,5 +1479,7 @@ export function createConverter(uriConverter?: URIConverter): Converter {
     asWorkspaceSymbol,
     asInlineCompletionParams,
     asInlineCompletionContext,
+    asDefinitionResult,
+    asLocationLink,
   };
 }

packages/libro-language-client/src/common/vscodeAdaptor/convertor.ts

@@ -1,4 +1,5 @@
 import type { CellView, LibroView } from '@difizen/libro-core';
+import { ExecutableNotebookModel } from '@difizen/libro-kernel';
 import type { NotebookCell, NotebookDocument, NotebookRange } from 'vscode';
 
 import { NotebookDocumentSyncFeature } from '../notebook.js';
@@ -9,14 +10,14 @@ import { EndOfLine, NotebookCellKind, Uri } from './vscodeAdaptor.js';
 export const l2c = {
   asNotebookDocument(libroView: LibroView): NotebookDocument {
     const model = libroView.model as any;
-    if (model.filePath === undefined) {
-      throw new Error('no filePath: invalid libro jupyter model');
+    if (!ExecutableNotebookModel.is(model)) {
+      throw new Error('invalid libro jupyter model');
     }
     const filePath = model.filePath as string;
     return {
       uri: Uri.parse(filePath),
       notebookType: 'jupyter',
-      version: 0,
+      version: libroView.model.version,
       isDirty: libroView.model.dirty,
       isUntitled: false,
       isClosed: false,
@@ -49,7 +50,7 @@ export const l2c = {
         fileName: filePath,
         isUntitled: false,
         languageId: 'python',
-        version: 0,
+        version: cell.model.version,
         isDirty: false,
         isClosed: false,
         save: unsupported,

packages/libro-language-client/src/common/vscodeAdaptor/monacoLanguages.ts

@@ -115,9 +115,25 @@ export class MonacoLanguages implements IMonacoLanguages {
     selector: DocumentSelector,
     provider: DefinitionProvider,
   ): Disposable {
+    return monaco.languages.registerDefinitionProvider(
+      selector,
+      this.createDefinitionProvider(provider),
+    );
+  }
+  protected createDefinitionProvider(
+    provider: DefinitionProvider,
+  ): monaco.languages.DefinitionProvider {
     return {
-      dispose: () => {
-        return;
+      provideDefinition: async (model, position, token) => {
+        const params = this.m2p.asTextDocumentPositionParams(model, position);
+        const result = await provider.provideDefinition(
+          { uri: model.uri } as any,
+          this.p2c.asPosition(params.position),
+          token,
+        );
+        return (
+          result && this.p2m.asDefinitionResult(this.c2p.asDefinitionResult(result))
+        );
       },
     };
   }

packages/libro-language-client/src/index.ts

@@ -3,3 +3,4 @@ export * from './libro-language-client.js';
 export * from './module.js';
 export * from './common/api.js';
 export * from './constants.js';
+export * from './util.js';