Merge pull request #9 from joshraphael/fix_comment_bounds

fix comment bounds list bug

Author: joshraphael

CHANGELOG.md

@@ -5,6 +5,19 @@ All notable changes to the "vscode-rascript" extension will be documented in thi
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [[0.3.2](https://github.com/joshraphael/vscode-rascript/releases/tag/v0.3.2)] - 2025-XX-XX
+
+[diff](https://github.com/joshraphael/vscode-rascript/compare/v0.3.1...v0.3.2)
+
+### Added
+
+### Changed
+
+- Syntax highlighting to use upstream [rascript-syntax](https://github.com/joshraphael/rascript-syntax) repo
+- Bug involving incorrect comment bounds detected for hover, definition and completion data
+
+### Removed
+
 ## [[0.3.1](https://github.com/joshraphael/vscode-rascript/releases/tag/v0.3.1)] - 2025-08-07
 
 [diff](https://github.com/joshraphael/vscode-rascript/compare/v0.3.0...v0.3.1)

src/clients/shared/parser.ts

@@ -137,15 +137,18 @@ export function getCommentBoundsList(document: vscode.TextDocument) {
   let commentBounds: models.CommentBounds[] = [];
   let inComment = false;
   let tempStart = 0;
-  for (let i = 0; i < text.length - 1; i++) {
+  if (text.length < 2) {
+    return commentBounds;
+  }
+  for (let i = 1; i < text.length; i++) {
     if (inComment) {
-      if (text[i] === "\n" || text === "\r") {
+      if (text[i] === "\n" || text[i] === "\r") {
         inComment = false;
         commentBounds.push({
           start: tempStart,
-          end: i,
+          end: i - 1,
           type: "Line",
-          raw: text.slice(tempStart, i + 1),
+          raw: text.slice(tempStart, i),
         });
       }
     } else {
@@ -160,7 +163,7 @@ export function getCommentBoundsList(document: vscode.TextDocument) {
         start: tempStart,
         end: i,
         type: "Line",
-        raw: text.slice(tempStart, i + 1),
+        raw: text.slice(tempStart),
       });
     }
   }
@@ -173,16 +176,18 @@ export function getCommentBoundsList(document: vscode.TextDocument) {
   for (let i = 1; i < text.length; i++) {
     if (inComment) {
       if (text[i - 1] + text[i] === "*/") {
+        // end
         inComment = false;
         commentBounds.push({
           start: tempStart,
-          end: i,
+          end: i - 1,
           type: "Block",
-          raw: text.slice(tempStart, i + 1),
+          raw: text.slice(tempStart, i),
         });
       }
     } else {
       if (text[i - 1] + text[i] === "/*") {
+        // start
         inComment = true;
         tempStart = i - 1;
       }
@@ -193,7 +198,7 @@ export function getCommentBoundsList(document: vscode.TextDocument) {
         start: tempStart,
         end: i,
         type: "Block",
-        raw: text.slice(tempStart, i + 1),
+        raw: text.slice(tempStart),
       });
     }
   }