Merge pull request #198 from SwiftFiddle/source-range

Normalize source range

Author: kishikawakatsumi

Public/js/app.js

@@ -205,10 +205,10 @@ export class App {
     this.structureView.onmouseover = (event, target, data) => {
       this.editor.selection.setRange(
         new Range(
-          data.range.startRow,
-          data.range.startColumn,
-          data.range.endRow,
-          data.range.endColumn
+          data.range.startRow - 1,
+          data.range.startColumn - 1,
+          data.range.endRow - 1,
+          data.range.endColumn - 1
         )
       );
     };
@@ -225,10 +225,10 @@ export class App {
       for (const range of ranges) {
         this.editor.session.addMarker(
           new Range(
-            range.startRow,
-            range.startColumn,
-            range.endRow,
-            range.endColumn
+            range.startRow - 1,
+            range.startColumn - 1,
+            range.endRow - 1,
+            range.endColumn - 1
           ),
           "editor-marker",
           "text"

Public/js/structure_view.js

@@ -118,7 +118,7 @@ function makeTokenPopoverContent(data) {
 function makeSourceRangePopoverContent(data, list) {
   const range = data.range;
   // prettier-ignore
-  const details = `Ln ${range.startRow + 1}, Col ${range.startColumn + 1} - Ln ${range.endRow + 1}, Col ${range.endColumn + 1}`;
+  const details = `Ln ${range.startRow}, Col ${range.startColumn} - Ln ${range.endRow}, Col ${range.endColumn}`;
   makeDescriptionList("Source Range", details, list);
 }
 

Sources/App/Controllers/TokenVisitor.swift

@@ -44,10 +44,10 @@ final class TokenVisitor: SyntaxRewriter {
       id: index,
       text: syntax,
       range: Range(
-        startRow: start.line.flatMap { $0 - 1 } ?? 1,
-        startColumn: start.column.flatMap { $0 - 1 } ?? 1,
-        endRow: end.line.flatMap { $0 - 1 } ?? 1,
-        endColumn: end.column.flatMap { $0 - 1 } ?? 1
+        startRow: start.line.flatMap { $0 } ?? 1,
+        startColumn: start.column.flatMap { $0 } ?? 1,
+        endRow: end.line.flatMap { $0 } ?? 1,
+        endColumn: end.column.flatMap { $0 } ?? 1
       ),
       type: syntaxType
     )