Merge pull request #6 from jamesainslie/fix-filescanner-error

fix(core): resolve file scanner errors and rendering issues

Author: jamesainslie

src/core/render-pipeline.ts

@@ -64,16 +64,14 @@ export class RenderPipeline {
       this.workersEnabled = true;
       debug.info('RenderPipeline', '✅ Worker pool initialized');
     } catch (error) {
-      // Workers unavailable (file:// URLs) - use optimized sync rendering
-      if (window.location.protocol === 'file:') {
-        debug.warn(
-          'RenderPipeline',
-          'Using optimized synchronous rendering (workers unavailable on file:// URLs)'
-        );
-      } else {
+      // Workers unavailable - WorkerPool already logged the reason
+      // Silently fall back to synchronous rendering
+      this.workersEnabled = false;
+
+      // Only log errors for unexpected failures (non-file:// protocols)
+      if (window.location.protocol !== 'file:') {
         debug.error('RenderPipeline', 'Worker initialization failed, using sync fallback:', error);
       }
-      this.workersEnabled = false;
     }
   }
 

src/options/options.html

@@ -203,7 +203,7 @@ <h2>Advanced</h2>
           <button id="btn-save" class="primary-button">Save Changes</button>
           <span id="save-status" class="save-status"></span>
         </div>
-        <p class="version">MDView v1.0.0</p>
+        <p class="version" id="app-version">MDView v1.0.0</p>
       </footer>
     </div>
 

src/options/options.ts

@@ -31,9 +31,24 @@ class OptionsManager {
     // Setup storage listener
     this.setupStorageListener();
 
+    // Set version
+    this.setAppVersion();
+
     debug.log('Options', 'Initialized');
   }
 
+  private setAppVersion(): void {
+    const versionElement = document.getElementById('app-version');
+    if (versionElement) {
+      // __APP_VERSION__ is injected by Vite at build time
+      try {
+        versionElement.textContent = `MDView v${__APP_VERSION__}`;
+      } catch (e) {
+        debug.warn('Options', 'Failed to set app version:', e);
+      }
+    }
+  }
+
   private setupStorageListener(): void {
     chrome.storage.onChanged.addListener((changes, areaName) => {
       if (areaName === 'sync' && changes.preferences) {

src/popup/popup.html

@@ -29,6 +29,18 @@ <h1>MDView</h1>
           </select>
         </section>
 
+        <!-- Log Level Selection -->
+        <section class="setting-section">
+          <label for="log-level-select" class="setting-label">Log Level</label>
+          <select id="log-level-select" class="theme-select">
+            <option value="none">None</option>
+            <option value="error">Error</option>
+            <option value="warn">Warning</option>
+            <option value="info">Info</option>
+            <option value="debug">Debug</option>
+          </select>
+        </section>
+
         <!-- Quick Toggles -->
         <section class="setting-section">
           <div class="toggle-group">
@@ -78,7 +90,7 @@ <h1>MDView</h1>
       </main>
 
       <footer class="popup-footer">
-        <p class="version">Version 1.0.0</p>
+        <p class="version" id="app-version">Version 1.0.0</p>
       </footer>
     </div>
 

src/popup/popup.ts

@@ -3,7 +3,7 @@
  * Manages popup UI and interactions
  */
 
-import type { AppState, ThemeName } from '../types';
+import type { AppState, ThemeName, LogLevel } from '../types';
 import { debug } from '../utils/debug-logger';
 
 class PopupManager {
@@ -24,9 +24,25 @@ class PopupManager {
     // Setup storage listener
     this.setupStorageListener();
 
+    // Set version
+    this.setAppVersion();
+
     debug.log('Popup', 'Initialized');
   }
 
+  private setAppVersion(): void {
+    const versionElement = document.getElementById('app-version');
+    if (versionElement) {
+      // __APP_VERSION__ is injected by Vite at build time
+      try {
+        versionElement.textContent = `Version ${__APP_VERSION__}`;
+      } catch (e) {
+        // Fallback if define replacement fails (e.g. in some dev environments)
+        debug.warn('Popup', 'Failed to set app version:', e);
+      }
+    }
+  }
+
   private setupStorageListener(): void {
     chrome.storage.onChanged.addListener((changes, areaName) => {
       if (areaName === 'sync' && changes.preferences) {
@@ -87,6 +103,12 @@ class PopupManager {
     if (syncTabs) {
       syncTabs.checked = preferences.syncTabs;
     }
+
+    // Update log level select
+    const logLevelSelect = document.getElementById('log-level-select') as HTMLSelectElement;
+    if (logLevelSelect) {
+      logLevelSelect.value = preferences.logLevel || 'error';
+    }
   }
 
   private setupEventListeners(): void {
@@ -156,6 +178,15 @@ class PopupManager {
       });
     }
 
+    // Log level select
+    const logLevelSelect = document.getElementById('log-level-select');
+    if (logLevelSelect) {
+      logLevelSelect.addEventListener('change', (e) => {
+        const target = e.target as HTMLSelectElement;
+        void this.handlePreferenceChange({ logLevel: target.value as LogLevel });
+      });
+    }
+
     // Settings button
     const btnSettings = document.getElementById('btn-settings');
     if (btnSettings) {

src/types/index.d.ts

@@ -4,6 +4,8 @@
  * Global window extensions
  */
 declare global {
+  const __APP_VERSION__: string;
+
   interface Window {
     __MDVIEW_MERMAID_CODE__?: Map<string, string>;
   }
@@ -281,4 +283,3 @@ export interface MermaidTaskResult {
   svg: string;
   id: string;
 }
-

src/utils/file-scanner.ts

@@ -140,6 +140,48 @@ export class FileScanner {
             debug.log('FileScanner', 'No change detected');
           }
         } catch (error) {
+          // Debug: Log error details for troubleshooting
+          debug.debug('FileScanner', '=== Error Analysis ===');
+          debug.debug('FileScanner', 'Error type:', typeof error);
+          debug.debug('FileScanner', 'Error instanceof Error:', error instanceof Error);
+          debug.debug('FileScanner', 'Error toString():', String(error));
+          debug.debug(
+            'FileScanner',
+            'Error message:',
+            error instanceof Error ? error.message : 'N/A'
+          );
+          debug.debug('FileScanner', 'Error name:', error instanceof Error ? error.name : 'N/A');
+
+          // Improved error handling with case-insensitive check
+          const errorStr = String(error).toLowerCase();
+          const errorMessage = error instanceof Error ? error.message.toLowerCase() : '';
+
+          debug.debug('FileScanner', 'errorStr (lowercase):', errorStr);
+          debug.debug('FileScanner', 'errorMessage (lowercase):', errorMessage);
+
+          const check1 = errorStr.includes('context invalidated');
+          const check2 = errorStr.includes('extension context');
+          const check3 = errorMessage.includes('context invalidated');
+
+          debug.debug('FileScanner', 'Check results:');
+          debug.debug('FileScanner', '  - errorStr.includes("context invalidated"):', check1);
+          debug.debug('FileScanner', '  - errorStr.includes("extension context"):', check2);
+          debug.debug('FileScanner', '  - errorMessage.includes("context invalidated"):', check3);
+
+          const isContextInvalid = check1 || check2 || check3;
+          debug.debug('FileScanner', 'isContextInvalid:', isContextInvalid);
+          debug.debug('FileScanner', '=== End Error Analysis ===');
+
+          // Handle extension context invalidation (e.g. after extension update/reload)
+          if (isContextInvalid) {
+            debug.warn('FileScanner', 'Extension context invalidated. Stopping file watcher.');
+            if (intervalId !== null) {
+              clearInterval(intervalId);
+              intervalId = null;
+            }
+            return;
+          }
+
           debug.error('FileScanner', 'Error communicating with background:', error);
         }
       })();

src/utils/section-splitter.ts

@@ -19,17 +19,44 @@ export interface MarkdownSection {
 export function splitIntoSections(markdown: string): MarkdownSection[] {
   const lines = markdown.split('\n');
   const sections: MarkdownSection[] = [];
-  
+
   let currentSection: string[] = [];
   let currentHeading: string | undefined;
   let currentLevel: number | undefined;
   let sectionStartLine = 0;
   let sectionId = 0;
-  
+
+  // Track fenced code block state
+  let inCodeFence = false;
+  let codeFenceChar = ''; // '`' or '~'
+  let codeFenceLength = 0; // minimum 3
+
   lines.forEach((line, index) => {
-    // Check if line is a heading (ATX style: # Heading)
-    const headingMatch = line.match(/^(#{1,6})\s+(.+)$/);
-    
+    // Check for code fence start/end (``` or ~~~)
+    const fenceMatch = line.match(/^(`{3,}|~{3,})/);
+
+    if (fenceMatch) {
+      const fenceStr = fenceMatch[1];
+      const fenceChar = fenceStr[0];
+      const fenceLen = fenceStr.length;
+
+      if (!inCodeFence) {
+        // Starting a code fence
+        inCodeFence = true;
+        codeFenceChar = fenceChar;
+        codeFenceLength = fenceLen;
+      } else if (fenceChar === codeFenceChar && fenceLen >= codeFenceLength) {
+        // Closing the code fence (must use same char and >= length)
+        inCodeFence = false;
+        codeFenceChar = '';
+        codeFenceLength = 0;
+      }
+      // If different fence char or shorter length, it's content inside the fence
+    }
+
+    // Only check for headings when NOT inside a code fence
+    const headingMatch = !inCodeFence && line.match(/^(#{1,6})\s+(.+)$/);
+
     if (headingMatch) {
       // Save previous section if it exists
       if (currentSection.length > 0) {
@@ -42,7 +69,7 @@ export function splitIntoSections(markdown: string): MarkdownSection[] {
           id: `section-${sectionId++}`,
         });
       }
-      
+
       // Start new section
       currentSection = [line];
       currentHeading = headingMatch[2];
@@ -52,7 +79,7 @@ export function splitIntoSections(markdown: string): MarkdownSection[] {
       currentSection.push(line);
     }
   });
-  
+
   // Add final section
   if (currentSection.length > 0) {
     sections.push({
@@ -64,7 +91,7 @@ export function splitIntoSections(markdown: string): MarkdownSection[] {
       id: `section-${sectionId++}`,
     });
   }
-  
+
   return sections;
 }
 
@@ -74,16 +101,16 @@ export function splitIntoSections(markdown: string): MarkdownSection[] {
 export function splitIntoChunks(markdown: string, chunkSize = 50000): MarkdownSection[] {
   const sections: MarkdownSection[] = [];
   const lines = markdown.split('\n');
-  
+
   let currentChunk: string[] = [];
   let currentSize = 0;
   let chunkStartLine = 0;
   let chunkId = 0;
-  
+
   lines.forEach((line, index) => {
     currentChunk.push(line);
     currentSize += line.length + 1; // +1 for newline
-    
+
     // If chunk is large enough, save it
     if (currentSize >= chunkSize) {
       sections.push({
@@ -92,13 +119,13 @@ export function splitIntoChunks(markdown: string, chunkSize = 50000): MarkdownSe
         endLine: index,
         id: `chunk-${chunkId++}`,
       });
-      
+
       currentChunk = [];
       currentSize = 0;
       chunkStartLine = index + 1;
     }
   });
-  
+
   // Add remaining lines
   if (currentChunk.length > 0) {
     sections.push({
@@ -108,7 +135,7 @@ export function splitIntoChunks(markdown: string, chunkSize = 50000): MarkdownSe
       id: `chunk-${chunkId++}`,
     });
   }
-  
+
   return sections;
 }
 
@@ -120,33 +147,32 @@ export function getInitialSections(
   options: { maxSections?: number; maxSize?: number; upToSectionId?: string } = {}
 ): MarkdownSection[] {
   const { maxSections = 3, maxSize = 30000, upToSectionId } = options;
-  
+
   // If we need to render up to a specific section (for scroll restoration),
   // render all sections up to and including that one
   if (upToSectionId) {
-    const targetIndex = sections.findIndex(s => s.id === upToSectionId);
+    const targetIndex = sections.findIndex((s) => s.id === upToSectionId);
     if (targetIndex !== -1) {
       // Render all sections up to the target, plus one more for context
       return sections.slice(0, Math.min(targetIndex + 2, sections.length));
     }
   }
-  
+
   const initial: MarkdownSection[] = [];
   let totalSize = 0;
-  
+
   for (const section of sections) {
     if (initial.length >= maxSections) break;
     if (totalSize + section.markdown.length > maxSize) break;
-    
+
     initial.push(section);
     totalSize += section.markdown.length;
   }
-  
+
   // Always include at least one section
   if (initial.length === 0 && sections.length > 0) {
     initial.push(sections[0]);
   }
-  
+
   return initial;
 }
-