Fix up after rebase

Author: Gold856

vscode-wpilib/media/main.css

@@ -48,7 +48,7 @@
 .uninstall-button {
   padding: 4px !important;
 
-  &>i {
+  & > i {
     margin-right: 4px !important;
     margin-left: 4px !important;
   }
@@ -63,11 +63,11 @@
   flex-shrink: 2;
 }
 
-button[id*="install-action"] {
+button[id*='install-action'] {
   flex-shrink: 0;
 }
 
-button[id*="version-action"] {
+button[id*='version-action'] {
   overflow: visible;
   padding: 1px 6px;
 }
@@ -134,7 +134,7 @@ html {
   padding: 0;
 }
 
-.vscode-select select[multiple]+.chevron-icon {
+.vscode-select select[multiple] + .chevron-icon {
   display: none;
 }
 
@@ -267,7 +267,7 @@ html {
 
 /* collapsible */
 
-.vscode-collapsible+.vscode-collapsible {
+.vscode-collapsible + .vscode-collapsible {
   border-top: 1px solid var(--vscode-sideBarSectionHeader-border);
 }
 
@@ -330,7 +330,6 @@ html {
   margin-right: 4px;
 }
 
-
 .vscode-badge {
   background-color: var(--vscode-badge-background);
   border: 1px solid var(--vscode-contrastBorder, transparent);
@@ -576,13 +575,13 @@ input::-webkit-inner-spin-button {
   margin: 0;
 }
 
-input[type=number] {
+input[type='number'] {
   -moz-appearance: textfield;
   appearance: textfield;
 }
 
 /* File input styling for the log viewer mode */
-input[type="file"] {
+input[type='file'] {
   display: none;
 }
 
@@ -693,7 +692,7 @@ label.toolbar-button {
   font-size: 16px;
   margin-bottom: 12px;
   color: var(--vscode-foreground);
-  width: 100%
+  width: 100%;
 }
 
 .project-error-text {
@@ -929,8 +928,8 @@ button:disabled {
   cursor: not-allowed;
 }
 
-input[type="text"],
-input[type="number"] {
+input[type='text'],
+input[type='number'] {
   background-color: var(--vscode-input-background, white);
   color: var(--vscode-input-foreground, black);
   border: 1px solid var(--vscode-input-border, #ccc);

vscode-wpilib/src/riolog/ansi/ansiparser.ts

@@ -12,34 +12,34 @@ export interface AnsiState {
 }
 
 // Color mapping for standard ANSI colors
-const foregroundColors: {[key: number]: string} = {
-  30: '#000000',  // black
-  31: '#f44336',  // red
-  32: '#4caf50',  // green
-  33: '#ffeb3b',  // yellow
-  34: '#2196f3',  // blue
-  35: '#e91e63',  // magenta
-  36: '#00bcd4',  // cyan
-  37: '#ffffff',  // white
-  90: '#9e9e9e',  // gray
-  91: '#ff5252',  // lightred
-  92: '#8bc34a',  // lightgreen
-  93: '#ffc107',  // lightyellow
-  94: '#03a9f4',  // lightblue
-  95: '#ec407a',  // lightmagenta
-  96: '#26c6da',  // lightcyan
-  97: '#fafafa',  // white
+const foregroundColors: { [key: number]: string } = {
+  30: '#000000', // black
+  31: '#f44336', // red
+  32: '#4caf50', // green
+  33: '#ffeb3b', // yellow
+  34: '#2196f3', // blue
+  35: '#e91e63', // magenta
+  36: '#00bcd4', // cyan
+  37: '#ffffff', // white
+  90: '#9e9e9e', // gray
+  91: '#ff5252', // lightred
+  92: '#8bc34a', // lightgreen
+  93: '#ffc107', // lightyellow
+  94: '#03a9f4', // lightblue
+  95: '#ec407a', // lightmagenta
+  96: '#26c6da', // lightcyan
+  97: '#fafafa', // white
 };
 
-const backgroundColors: {[key: number]: string} = {
-  40: '#000000',  // black
-  41: '#f44336',  // red
-  42: '#4caf50',  // green
-  43: '#ffeb3b',  // yellow
-  44: '#2196f3',  // blue
-  45: '#e91e63',  // magenta
-  46: '#00bcd4',  // cyan
-  47: '#ffffff',  // white
+const backgroundColors: { [key: number]: string } = {
+  40: '#000000', // black
+  41: '#f44336', // red
+  42: '#4caf50', // green
+  43: '#ffeb3b', // yellow
+  44: '#2196f3', // blue
+  45: '#e91e63', // magenta
+  46: '#00bcd4', // cyan
+  47: '#ffffff', // white
   100: '#9e9e9e', // gray
   101: '#ff5252', // lightred
   102: '#8bc34a', // lightgreen
@@ -59,28 +59,28 @@ export interface AnsiSegment {
 export function parseAnsiString(text: string): AnsiSegment[] {
   const result: AnsiSegment[] = [];
   const regex = /\u001b\[((?:\d+;)*\d*)m/g;
-  
+
   let lastIndex = 0;
   let match: RegExpExecArray | null;
   let currentState: AnsiState = {};
-  
+
   while ((match = regex.exec(text)) !== null) {
     // Add text before the escape sequence with current state
     const segment = text.substring(lastIndex, match.index);
     if (segment) {
       result.push({
         text: segment,
-        state: { ...currentState }
+        state: { ...currentState },
       });
     }
-    
+
     // Update state based on escape sequence
-    const codes = match[1].split(';').map(num => parseInt(num || '0', 10));
-    
+    const codes = match[1].split(';').map((num) => parseInt(num || '0', 10));
+
     // Process codes
     for (let i = 0; i < codes.length; i++) {
       const code = codes[i];
-      
+
       // Process reset and text styles
       if (code === 0) {
         // Reset all attributes
@@ -108,16 +108,16 @@ export function parseAnsiString(text: string): AnsiSegment[] {
         delete currentState.foreground;
       } else if (code === 49) {
         delete currentState.background;
-      } 
+      }
       // Standard colors
       else if ((code >= 30 && code <= 37) || (code >= 90 && code <= 97)) {
         currentState.foreground = foregroundColors[code];
       } else if ((code >= 40 && code <= 47) || (code >= 100 && code <= 107)) {
         currentState.background = backgroundColors[code];
       }
       // 8-bit color support (256 colors)
-      else if (code === 38 && i + 2 < codes.length && codes[i+1] === 5) {
-        const colorCode = codes[i+2];
+      else if (code === 38 && i + 2 < codes.length && codes[i + 1] === 5) {
+        const colorCode = codes[i + 2];
         // Generate 8-bit color
         if (colorCode < 8) {
           // Standard colors (0-7)
@@ -137,9 +137,8 @@ export function parseAnsiString(text: string): AnsiSegment[] {
           currentState.foreground = `rgb(${gray}, ${gray}, ${gray})`;
         }
         i += 2; // Skip the next two parameters
-      }
-      else if (code === 48 && i + 2 < codes.length && codes[i+1] === 5) {
-        const colorCode = codes[i+2];
+      } else if (code === 48 && i + 2 < codes.length && codes[i + 1] === 5) {
+        const colorCode = codes[i + 2];
         // Same logic for background colors
         if (colorCode < 8) {
           currentState.background = backgroundColors[colorCode + 40];
@@ -157,34 +156,33 @@ export function parseAnsiString(text: string): AnsiSegment[] {
         i += 2; // Skip the next two parameters
       }
       // 24-bit color support (RGB)
-      else if (code === 38 && i + 4 < codes.length && codes[i+1] === 2) {
-        const r = codes[i+2];
-        const g = codes[i+3];
-        const b = codes[i+4];
+      else if (code === 38 && i + 4 < codes.length && codes[i + 1] === 2) {
+        const r = codes[i + 2];
+        const g = codes[i + 3];
+        const b = codes[i + 4];
         currentState.foreground = `rgb(${r}, ${g}, ${b})`;
         i += 4; // Skip the next four parameters
-      }
-      else if (code === 48 && i + 4 < codes.length && codes[i+1] === 2) {
-        const r = codes[i+2];
-        const g = codes[i+3];
-        const b = codes[i+4];
+      } else if (code === 48 && i + 4 < codes.length && codes[i + 1] === 2) {
+        const r = codes[i + 2];
+        const g = codes[i + 3];
+        const b = codes[i + 4];
         currentState.background = `rgb(${r}, ${g}, ${b})`;
         i += 4; // Skip the next four parameters
       }
     }
-    
+
     lastIndex = match.index + match[0].length;
   }
-  
+
   // Add the remaining text with current state
   const remainingText = text.substring(lastIndex);
   if (remainingText) {
     result.push({
       text: remainingText,
-      state: { ...currentState }
+      state: { ...currentState },
     });
   }
-  
+
   return result;
 }
 

vscode-wpilib/src/riolog/riologwindow.ts

@@ -79,12 +79,12 @@ export class RioLogWindow {
 
   private createWebView() {
     this.webview = this.windowProvider.createWindowView();
-    
+
     this.webview.on('windowActive', async () => {
       if (this.webview === undefined) {
         return;
       }
-      
+
       // Window goes active.
       await this.webview.postMessage({
         message: this.hiddenArray,

vscode-wpilib/src/riolog/script/implscript.ts

@@ -1,7 +1,7 @@
 'use strict';
 
-import { IIPCReceiveMessage, IIPCSendMessage } from '../shared/interfaces';
-import { checkResizeImpl, handleMessage } from '../shared/sharedscript';
+import { IIPCReceiveMessage, IIPCSendMessage } from 'wpilib-riolog';
+import { setImplFunctions, handleMessage } from '../shared/sharedscript';
 
 interface IVsCodeApi {
   postMessage(message: IIPCReceiveMessage, to: string): void;
@@ -15,7 +15,7 @@ export function checkResize(): void {
   // Get required elements
   const toolbar = document.getElementById('toolbar');
   const logContainer = document.getElementById('log-container');
-  
+
   // Apply dynamic max-height calculation if both elements exist
   if (toolbar && logContainer) {
     logContainer.style.maxHeight = `calc(100vh - ${toolbar.offsetHeight}px)`;
@@ -34,7 +34,7 @@ export function sendMessage(message: IIPCReceiveMessage) {
 }
 
 // Register the implementation functions with the shared module
-console.log('Setting impl functions')
+console.log('Setting impl functions');
 setImplFunctions(checkResize, scrollImpl, sendMessage);
 
 window.addEventListener('message', (event) => {