Merge pull request #15 from kaigouthro/main

Updated v6 + syntax + theme + md code block hillites
this time tested >.<  .. works

Author: kaigouthro

package.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "https://github.com/FFriZ/Pine-Script-v5-VS-Code"
   },
-  "version": "0.1.7",
+  "version": "0.1.8",
   "type": "commonjs",
   "engines": {
     "vscode": "^1.93.0",
@@ -62,6 +62,12 @@
         "uiTheme": "vs-dark",
         "path": "themes/Pine-Original.json"
       },
+      {
+        "label": "Pine-V4-Classic",
+        "id": "Dark V4 Theme (Deep Coverage)",
+        "uiTheme": "vs-dark",
+        "path": "themes/Pine-classic-v4.json"
+      },
       {
         "label": "Pine-Basic",
         "id": "Dark Theme (Basic)",
@@ -312,7 +318,14 @@
       {
         "language": "pine",
         "scopeName": "source.pine",
-        "path": "themes/pine.tmLanguage.json"
+        "path": "syntaxes/pine.tmLanguage.json"
+      },
+      {
+        "scopeName": "source.markdown",
+        "path": "syntaxes/pine-embedded.tmLanguage.json",
+        "injectTo": [
+          "text.html.markdown"
+        ]
       }
     ]
   },
@@ -343,7 +356,7 @@
     "ts-loader": "^9.5.1",
     "type-coverage": "^2.0.0",
     "typedoc": "^0.26.7",
-    "typescript": "^5.6.2",
+    "typescript": "^5.7.3",
     "webpack": "^5.94.0",
     "webpack-cli": "^5.1.4",
     "xo": "^0.54.0"

src/PineClass.ts

@@ -7,7 +7,7 @@ import { PineUserInputs } from './PineUserInputs'
 import { PineHoverProvider } from './PineHoverProvider/PineHoverProvider'
 import { PineLibCompletionProvider } from './PineLibCompletionProvider'
 import { PineLibHoverProvider } from './PineLibHoverProvider'
-import { PineInlineCompletionContext, PineCompletionProvider } from './PineCompletionProvider'
+import { PineInlineCompletionHandler, PineCompletionProvider } from './PineCompletionProvider'
 import { PineFormatResponse } from './PineFormatResponse'
 import { PineScriptList } from './PineScriptList'
 import { PineTemplates } from './PineTemplates'
@@ -28,7 +28,7 @@ export class Class {
   public static pineLibHoverProvider: PineLibHoverProvider
   public static pineLibCompletionProvider: PineLibCompletionProvider
   public static pineSignatureHelpProvider: PineSignatureHelpProvider
-  public static pineInlineCompletionContext: PineInlineCompletionContext
+  public static pineInlineCompletionContext: PineInlineCompletionHandler
   public static pineCompletionProvider: PineCompletionProvider
   public static pineColorProvider: PineColorProvider
   public static pineScriptList: PineScriptList
@@ -131,7 +131,7 @@ export class Class {
    * Lazy loads and returns an instance of PineInlineCompletionContext.
    * @returns {PineInlineCompletionContext} The PineInlineCompletionContext instance.
    */
-  static get PineInlineCompletionContext(): PineInlineCompletionContext {
+  static get PineInlineCompletionContext(): PineInlineCompletionHandler {
     if (!Class.pineInlineCompletionContext) {
       Class.PineCompletionSignatureInitOrder()
     }
@@ -148,7 +148,7 @@ export class Class {
     }
     if (!Class.pineCompletionProvider) {
       // console.log('PineCompletionProvider initializing')
-      Class.pineInlineCompletionContext = new PineInlineCompletionContext()
+      Class.pineInlineCompletionContext = new PineInlineCompletionHandler()
       Class.pineCompletionProvider = new PineCompletionProvider()
     }
   }

src/PineColorProvider.ts

@@ -94,7 +94,7 @@ export class PineColorProvider implements vscode.DocumentColorProvider {
         this.findColors(text, document, this.regexColorNew),
         this.findColors(text, document, this.regexColorRgb),
       ]
-      
+
       // Add all found colors to the colorInfos array
       findColors.forEach((result): any => colorInfos.push(...result))
       return colorInfos
@@ -121,11 +121,11 @@ export class PineColorProvider implements vscode.DocumentColorProvider {
       const range = this.extractRange(document, match.index, colorString)
 
       // Skip if the color is within a comment
-      if (this.isWithinComment(document, range.start)) {continue}
+      if (this.isWithinComment(document, range.start)) { continue }
 
       // Parse the color string and add it to the colorInfos array
       const color = this.parseColorString(colorString)
-      if (!color) {continue}
+      if (!color) { continue }
       colorInfos.push(new vscode.ColorInformation(range, color))
     }
     return colorInfos
@@ -178,17 +178,17 @@ export class PineColorProvider implements vscode.DocumentColorProvider {
     // Subtract from 1 and divide by 100 to normalize to 0-1 range
     return 1 - alpha / 100
   }
-  
+
   /**
    * Denormalizes an alpha value from the 0-1 range to the 0-100 range.
    * @param alpha - The alpha value to denormalize.
    * @returns The denormalized alpha value.
    */
   private denormalizeAlpha(alpha: number) {
     // Subtract from 1, multiply by 100 and round to denormalize to 0-100 range
-    return 100 - Math.round(100 * alpha) 
+    return 100 - Math.round(100 * alpha)
   }
-  
+
   /**
    * Converts a number to a hex string.
    * @param color - The number to convert.
@@ -213,9 +213,9 @@ export class PineColorProvider implements vscode.DocumentColorProvider {
     const g = this.hexFromNumber(color.green);
     const b = this.hexFromNumber(color.blue);
     const alphaHex = this.hexFromNumber(color.alpha); // Convert alpha for standard RGBA format
-    
+
     let hexColor = `#${r}${g}${b}`;
-    
+
     if (includeAlphaOrLiteral === 'alpha' && color.alpha !== 1) {
       return `${hexColor}${alphaHex}`; // Append alpha in hex if not fully visible
     } else if (includeAlphaOrLiteral === 'literal') {
@@ -226,7 +226,7 @@ export class PineColorProvider implements vscode.DocumentColorProvider {
     }
     return hexColor;
   }
-  
+
   /**
      * Gets the literal color name for a given hex color.
      * @param hexColor - The hex color to get the literal color name for.
@@ -240,7 +240,7 @@ export class PineColorProvider implements vscode.DocumentColorProvider {
     }
     return null
   }
-  
+
   /**
      * Converts a vscode.Color object to an RGB color string.
      * @param color - The vscode.Color object to convert.
@@ -256,7 +256,7 @@ export class PineColorProvider implements vscode.DocumentColorProvider {
     const a = this.denormalizeAlpha(color.alpha)
     return `color.rgb(${r}, ${g}, ${b}, ${a})`
   }
-  
+
   /**
      * Converts a vscode.Color object to a new color string.
      * @param color - The vscode.Color object to convert.
@@ -266,7 +266,7 @@ export class PineColorProvider implements vscode.DocumentColorProvider {
     const hexColor = this.colorHexPresentation(color, 'noAlpha')
     return `color.new(${hexColor}, ${this.denormalizeAlpha(color.alpha)})`
   }
-  
+
   /**
      * Converts a hex color string to a vscode.Color object.
      * @param hex - The hex color string to convert.

src/PineCompletionProvider.ts

@@ -7,35 +7,76 @@ import * as vscode from 'vscode'
  * Context for Pine Inline Completion.
  * Provides necessary information for generating inline completions in Pine Script.
  */
-export class PineInlineCompletionContext implements vscode.InlineCompletionItemProvider {
-  selectedCompletionText: string | undefined;
-
+export class PineInlineCompletionHandler {
   /**
-   * Provides inline completion items for the current position in the document.
-   * @param document - The current document.
-   * @param position - The current position within the document.
+   * Handles the selection of an inline completion item.
    * @param context - The inline completion context.
-   * @returns null
    */
-  provideInlineCompletionItems(document: vscode.TextDocument, position: vscode.Position, context: vscode.InlineCompletionContext): vscode.ProviderResult<vscode.InlineCompletionItem[] | vscode.InlineCompletionList> {
-    const selectedCompletionText = context.selectedCompletionInfo?.text
+  handleInlineCompletionSelection(context: vscode.InlineCompletionContext): void {
+    const selectedCompletionText = context.selectedCompletionInfo?.text;
 
     if (selectedCompletionText) {
-      this.selectedCompletionText = selectedCompletionText
-      PineSharedCompletionState.setSelectedCompletion(context.selectedCompletionInfo?.text)
-      vscode.commands.executeCommand('editor.action.triggerParameterHints')
+      PineSharedCompletionState.setSelectedCompletion(selectedCompletionText);
+      vscode.commands.executeCommand('editor.action.triggerParameterHints');
     }
+  }
 
-    // console.log(context.selectedCompletionInfo?.text, 'selectedCompletionInfo')
-    return null
+  provideInlineCompletionItems(
+    document: vscode.TextDocument,
+    position: vscode.Position,
+    context: vscode.InlineCompletionContext,
+    token: vscode.CancellationToken
+  ): vscode.ProviderResult<vscode.InlineCompletionItem[] | vscode.InlineCompletionList> {
+    // Implement your inline completion logic here
+    return [];
   }
 
   /**
    * Clears the selected completion text.
    */
-  clearSelectedCompletion() {
-    PineSharedCompletionState.setSelectedCompletion(undefined)
+  clearSelectedCompletion(): void {
+    PineSharedCompletionState.setSelectedCompletion(undefined);
   }
+
+  /**
+   * Registers the completion handler.
+   * @param context - The extension context.
+   */
+  public static register(context: vscode.ExtensionContext): void {
+    const completionHandler = new PineInlineCompletionHandler();
+
+    context.subscriptions.push(
+      vscode.window.onDidChangeTextEditorSelection(event => {
+        const editor = event.textEditor;
+        if (editor) {
+          const position = editor.selection.active;
+          const {document} = editor;
+          const range = new vscode.Range(position, position);
+          let selectedInfo = undefined;
+
+          // Check if the selection change was triggered by an inline completion
+          if (event.kind === vscode.TextEditorSelectionChangeKind.Mouse) {
+            const lastCompletion = PineSharedCompletionState.getLastCompletion();
+            if (lastCompletion && lastCompletion.range.contains(position)) {
+              selectedInfo = {
+                range: lastCompletion.range,
+                text: lastCompletion.insertText as string
+              };
+            }
+          }
+
+          const context: vscode.InlineCompletionContext = {
+            selectedCompletionInfo: selectedInfo,
+            triggerKind: vscode.InlineCompletionTriggerKind.Automatic
+          };
+
+          completionHandler.handleInlineCompletionSelection(context);
+        }
+      })
+    );
+  }
+
+
 }
 
 export class PineCompletionProvider implements vscode.CompletionItemProvider {
@@ -161,9 +202,7 @@ export class PineCompletionProvider implements vscode.CompletionItemProvider {
         const wordBoundaryRegexArgs = /(?:\(|,)?\s*\b[\w.]+$/
         const argStartMatch = wordBoundaryRegexArgs.exec(textBeforeCursor)
         let argStart = argStartMatch ? position.character - argStartMatch[0].length : position.character
-        if (argStart < 0) {
-          argStart = 0
-        }
+        argStart = Math.max(argStart, 0)
 
         if (!PineSharedCompletionState.getIsLastArg) {
           insertText += ''
@@ -178,9 +217,7 @@ export class PineCompletionProvider implements vscode.CompletionItemProvider {
         const wordBoundaryRegex = /\b[\w.]+$/
         const wordStartMatch = wordBoundaryRegex.exec(textBeforeCursor)
         let wordStart = wordStartMatch ? position.character - wordStartMatch[0].length : position.character
-        if (wordStart < 0) {
-          wordStart = 0
-        }
+        wordStart = Math.max(wordStart, 0)
 
         // Set the replacement range and insert text of the completion item
         completionItem.insertText = insertText
@@ -317,10 +354,14 @@ export class PineCompletionProvider implements vscode.CompletionItemProvider {
 
             if (foundIndex === -1) {
               typoTrack++;
-              if (typoTrack > 1) break;
+              if (typoTrack > 1) {
+                break;
+              }
             } else if (foundIndex !== matchIndex) {
               minorTypoCount++;
-              if (minorTypoCount >= 3) break;
+              if (minorTypoCount >= 3) {
+                break;
+              }
               matchIndex = foundIndex + 1;
             } else {
               matchIndex++;
@@ -402,7 +443,7 @@ export class PineCompletionProvider implements vscode.CompletionItemProvider {
         'controls',
         'annotations',
         'fields',
-        'fields2'
+        'fields2',
       );
 
       const lowerMatch = match.toLowerCase();
@@ -421,10 +462,14 @@ export class PineCompletionProvider implements vscode.CompletionItemProvider {
 
             if (foundIndex === -1) {
               majorTypoCount++;
-              if (majorTypoCount > 1) break;
+              if (majorTypoCount > 1) {
+                break;
+              }
             } else if (foundIndex !== matchIndex) {
               minorTypoCount++;
-              if (minorTypoCount >= 3) break;
+              if (minorTypoCount >= 3) {
+                break;
+              }
               matchIndex = foundIndex + 1;
             } else {
               matchIndex++;

src/PineConsole.ts

@@ -4,32 +4,31 @@ import * as vscode from 'vscode';
 
 export class PineConsole {
   private static _channel: vscode.OutputChannel | undefined;
-  
+
   public static get channel() {
     if (!PineConsole._channel) {
       PineConsole._channel = vscode.window.createOutputChannel('Pine Script Console', 'js');
     }
     return PineConsole._channel;
   }
-  
+
   public static log(...message: any) {
     PineConsole.channel.appendLine(JSON.stringify(message));
     PineConsole.channel.appendLine('');
     return PineConsole
   }
-  
+
   public static show(toShow: boolean = false) {
     if (toShow) {
       PineConsole.channel.show(true);
     }
   }
-  
+
   public static clear() {
     PineConsole.channel.clear();
   }
-  
+
   public static dispose() {
     PineConsole.channel.dispose();
-  } 
+  }
 }
-