Fix code review issues: use substring instead of substr, improve context detection

Co-authored-by: hotlong <50353452+hotlong@users.noreply.github.com>

Author: Copilot

packages/vscode-extension/src/providers/CompletionProvider.ts

@@ -14,7 +14,7 @@ export class CompletionProvider
   ): vscode.ProviderResult<vscode.CompletionItem[] | vscode.CompletionList> {
     const linePrefix = document
       .lineAt(position)
-      .text.substr(0, position.character);
+      .text.substring(0, position.character);
 
     // Get completion items based on context
     const items: vscode.CompletionItem[] = [];
@@ -148,17 +148,32 @@ export class CompletionProvider
 
   /**
    * Get current type from document context
+   * Note: This is a simplified implementation. For production use,
+   * consider using a proper JSON parser or AST for accurate context detection.
    */
   private getCurrentType(
     document: vscode.TextDocument,
     position: vscode.Position
   ): string | null {
-    // Simple implementation - in production would use proper JSON parsing
-    const text = document.getText();
-    const offset = document.offsetAt(position);
-    const before = text.substring(Math.max(0, offset - 200), offset);
-
-    const match = before.match(/"type"\s*:\s*"(\w+)"/);
-    return match ? match[1] : null;
+    try {
+      const text = document.getText();
+      const offset = document.offsetAt(position);
+      
+      // Look backwards for the nearest "type" property
+      const before = text.substring(Math.max(0, offset - 500), offset);
+      
+      // Find all type declarations in the context
+      const typeMatches = Array.from(before.matchAll(/"type"\s*:\s*"(\w+)"/g));
+      
+      // Return the most recent one
+      if (typeMatches.length > 0) {
+        return typeMatches[typeMatches.length - 1][1];
+      }
+    } catch (error) {
+      // Fail silently - just won't provide context-specific completions
+      console.error('Error detecting current type:', error);
+    }
+    
+    return null;
   }
 }

packages/vscode-extension/src/providers/SchemaValidator.ts

@@ -183,14 +183,31 @@ export class SchemaValidator {
 
   /**
    * Find the range of a property in the document
+   * Note: This is a simplified implementation that returns a default range.
+   * TODO: For production use, implement proper JSON parsing to find exact property locations.
+   * Consider using a JSON parser with position tracking or VSCode's built-in JSON language service.
    */
   private findPropertyRange(
     document: vscode.TextDocument,
     path: string,
     property: string
   ): vscode.Range {
-    // For now, return the start of the document
-    // In a full implementation, this would parse the JSON and find the exact location
+    try {
+      // Attempt to find the property in the document
+      const text = document.getText();
+      const searchPattern = new RegExp(`"${property}"\\s*:`);
+      const match = searchPattern.exec(text);
+      
+      if (match && match.index !== undefined) {
+        const pos = document.positionAt(match.index);
+        return new vscode.Range(pos, pos.translate(0, property.length + 2));
+      }
+    } catch (error) {
+      // If we can't find it, fall back to the beginning
+      console.error('Error finding property range:', error);
+    }
+    
+    // Fallback: return the start of the document
     return new vscode.Range(0, 0, 0, 1);
   }