Experiment/change span to range

src/cli/commands/lspCmd.ts

@@ -13,11 +13,10 @@
   _Connection,
   createConnection,
 } from "vscode-languageserver";
-import { TextDocument, Range } from "vscode-languageserver-textdocument";
+import { TextDocument } from "vscode-languageserver-textdocument";
 import {
   AntlrLexerError,
   AntlrParsingError,
-  Span,
   UntypedModule,
   parse,
 } from "../../parser";
@@ -63,7 +62,7 @@
         message: err.description,
         source: "Parsing",
         severity: DiagnosticSeverity.Error,
-        range: spannedToRange(document, err.span),
+        range: err.range,
       },
     ],
   };
@@ -89,19 +88,14 @@
   document: TextDocument,
   err: AntlrLexerError,
 ): PublishDiagnosticsParams {
-  const position: Position = {
-    character: err.column,
-    line: err.line,
-  };
-
   return {
     uri: document.uri,
     diagnostics: [
       {
         message: err.description,
         source: "Parsing",
         severity: DiagnosticSeverity.Error,
-        range: { start: position, end: position },
+        range: { start: err.position, end: err.position },
       },
     ],
   };
@@ -120,7 +114,7 @@
           `${e.description.errorName}\n\n${e.description.shortDescription()}`,
       ),
       severity: toDiagnosticSeverity(e.description.severity),
-      range: spannedToRange(document, e.span),
+      range: e.range,
     })),
   };
 }
@@ -305,12 +299,12 @@
     if (module?.typed === undefined) {
       return;
     }
-    return getInlayHints(module.typed, module.document).map(
+    return getInlayHints(module.typed).map(
       (hint): InlayHint => ({
         label: hint.label,
         paddingLeft: hint.paddingLeft,
         kind: InlayHintKind.Type,
-        position: module.document.positionAt(hint.offset),
+        position: hint.positition,
       }),
     );
   });
@@ -336,9 +330,7 @@
       return;
     }
 
-    const offset = module.document.offsetAt(position);
-
-    const hint = functionSignatureHint(module.typed, offset);
+    const hint = functionSignatureHint(module.typed, position);
 
     if (hint === undefined) {
       return;
@@ -369,9 +361,7 @@
       return;
     }
 
-    const offset = module.document.offsetAt(position);
-
-    const kind = getCompletionItems(module.typed, offset, {
+    const kind = getCompletionItems(module.typed, position, {
       getModuleByNs(ns) {
         return state.moduleByNs(ns)?.typed;
       },
@@ -392,18 +382,14 @@
     }
 
     const refs =
-      findReferences(
-        ns,
-        module.document.offsetAt(position),
-        state.getTypedProject(),
-      )?.references ?? [];
+      findReferences(ns, position, state.getTypedProject())?.references ?? [];
 
     return refs.map(([referenceNs, referenceExpr]) => {
       const referenceModule = state.moduleByNs(referenceNs)!;
 
       return {
         uri: referenceModule.document.uri,
-        range: spannedToRange(referenceModule.document, referenceExpr.span),
+        range: referenceExpr.range,
       };
     });
   });
@@ -423,11 +409,7 @@
       return;
     }
 
-    const refs = findReferences(
-      ns,
-      module.document.offsetAt(position),
-      state.getTypedProject(),
-    );
+    const refs = findReferences(ns, position, state.getTypedProject());
 
     if (refs === undefined) {
       return;
@@ -440,10 +422,7 @@
 
         getOrDefault(changes, module.document.uri, []).push({
           newText: newName,
-          range: spannedToRange(
-            module.document,
-            refs.resolution.declaration.binding.span,
-          ),
+          range: refs.resolution.declaration.binding.range,
         });
 
         break;
@@ -467,7 +446,7 @@
 
       getOrDefault(changes, refModule.document.uri, []).push({
         newText,
-        range: spannedToRange(refModule.document, ident.span),
+        range: ident.range,
       });
     }
 
@@ -486,12 +465,14 @@
     }
 
     const formatted_ = format(module.untyped);
+
+    const start: Position = { line: 0, character: 0 };
+    const len = module.document.getText().length;
+    const end = module.document.positionAt(len);
+
     return [
       {
-        range: spannedToRange(module.document, [
-          0,
-          module.document.getText().length,
-        ]),
+        range: { start, end },
         newText: formatted_,
       } as TextEdit,
     ];
@@ -509,18 +490,18 @@
 
     const decls = module.typed.declarations.map((st) => ({
       name: st.binding.name,
-      span: st.span,
+      range: st.range,
     }));
     const typeDecl = module.typed.typeDeclarations.map((st) => ({
       name: st.name,
-      span: st.span,
+      range: st.range,
     }));
-    return decls.concat(typeDecl).map(({ span, name }) => ({
+    return decls.concat(typeDecl).map(({ range, name }) => ({
       kind: SymbolKind.Variable,
       name,
       location: {
         uri: textDocument.uri,
-        range: spannedToRange(module.document, span),
+        range,
       },
     }));
   });
@@ -531,11 +512,11 @@
       return;
     }
 
-    return module.typed.declarations.map(({ span, binding, scheme }) => {
+    return module.typed.declarations.map(({ range, binding, scheme }) => {
       const tpp = typeToString(binding.$.asType(), scheme);
       return {
         command: { title: tpp, command: "noop" },
-        range: spannedToRange(module.document, span),
+        range,
       };
     });
   });
@@ -548,8 +529,7 @@
       return;
     }
 
-    const offset = module.document.offsetAt(position);
-    const resolved = goToDefinitionOf(module.typed, offset);
+    const resolved = goToDefinitionOf(module.typed, position);
     if (resolved === undefined) {
       return undefined;
     }
@@ -561,7 +541,7 @@
 
     return {
       uri: definitionDoc.uri,
-      range: spannedToRange(definitionDoc, resolved.span),
+      range: resolved.range,
     };
   });
 
@@ -571,16 +551,15 @@
       return;
     }
 
-    const offset = module.document.offsetAt(position);
-    const hoverData = hoverOn(module.ns, module.typed, offset);
+    const hoverData = hoverOn(module.ns, module.typed, position);
     if (hoverData === undefined) {
       return undefined;
     }
 
     const [scheme, hover] = hoverData;
     const md = hoverToMarkdown(scheme, hover);
     return {
-      range: spannedToRange(module.document, hover.span),
+      range: hover.range,
       contents: {
         kind: MarkupKind.Markdown,
         value: md,
@@ -592,13 +571,6 @@
   connection.listen();
 }
 
-function spannedToRange(doc: TextDocument, [start, end]: Span): Range {
-  return {
-    start: doc.positionAt(start),
-    end: doc.positionAt(end),
-  };
-}
-
 function toDiagnosticSeverity(severity: Severity): DiagnosticSeverity {
   switch (severity) {
     case "error":

src/compiler/optimize.ts

@@ -21,7 +21,7 @@ function foldInfix(
   return {
     type: "constant",
     value: fold(left.value, right.value),
-    span: src.span,
+    range: src.range,
     $: src.$,
   };
 }
@@ -93,7 +93,7 @@ const iifFolding: Optimization = (src) => {
   return zipped.reduceRight(
     (acc, [pattern, arg]): TypedExpr => ({
       type: "let",
-      span: src.span,
+      range: src.range,
       $: src.$,
       pattern,
       body: acc,

src/documentation.ts

@@ -1,5 +1,7 @@
 import { TypedProject } from "./cli/common";
+import { Position } from "./parser";
 import { TypedModule, TypedTypeAst, typeToString } from "./typecheck";
+import { gtEqPos } from "./typecheck/typedAst/common";
 
 export type Variant = {
   name: string;
@@ -52,7 +54,7 @@ export function makeModuleDoc(
 ): ModuleDoc {
   const items: Item[] = [];
 
-  const indexes = new WeakMap<Item, number>();
+  const positions = new WeakMap<Item, Position>();
 
   for (const decl of typedModule.declarations) {
     if (!decl.pub) {
@@ -69,7 +71,7 @@ export function makeModuleDoc(
       item.docComment = decl.docComment;
     }
 
-    indexes.set(item, decl.span[0]);
+    positions.set(item, decl.range.start);
     items.push(item);
   }
 
@@ -99,11 +101,16 @@ export function makeModuleDoc(
       }));
     }
 
-    indexes.set(item, typeDecl.span[0]);
+    positions.set(item, typeDecl.range.start);
     items.push(item);
   }
 
-  items.sort((a, b) => indexes.get(a)! - indexes.get(b)!);
+  items.sort((a, b) => {
+    if (gtEqPos(positions.get(a)!, positions.get(b)!)) {
+      return 1;
+    }
+    return -1;
+  });
 
   const moduleDoc: ModuleDoc = {
     moduleName,

src/errors.ts

@@ -1,12 +1,12 @@
 import { showErrorLine } from "./errors/showErrorLine";
-import { Span } from "./parser";
+import { Range } from "./parser";
 import { Type, typeToString } from "./typecheck";
 import { col, withDisabled } from "./utils/colors";
 
 export type Severity = "error" | "warning";
 
 export type ErrorInfo = {
-  span: Span;
+  range: Range;
   description: ErrorDescription;
 };
 
@@ -302,7 +302,7 @@ export class MissingRequiredFields implements ErrorDescription {
 
 export function errorInfoToString(
   src: string,
-  { description, span }: ErrorInfo,
+  { description, range }: ErrorInfo,
   disableColors: boolean = false,
 ): string {
   return withDisabled(disableColors, () => {
@@ -314,6 +314,6 @@ export function errorInfoToString(
 
 ${description.shortDescription()}
 
-${showErrorLine(src, span)}`;
+${showErrorLine(src, range)}`;
   });
 }