Merge pull request #380 from mre/feat/377

Display snippets in IntelliSense

Author: VladBrok

README.md

@@ -6,7 +6,7 @@
 [![GitHub](https://img.shields.io/github/release/mre/vscode-snippet.svg?style=flat-square)](https://github.com/mre/vscode-snippet/releases)
 [![GitHub Marketplace](https://img.shields.io/badge/Marketplace-Snippet-blue.svg?colorA=24292e&colorB=0366d6&style=flat&longCache=true&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAM6wAADOsB5dZE0gAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAERSURBVCiRhZG/SsMxFEZPfsVJ61jbxaF0cRQRcRJ9hlYn30IHN/+9iquDCOIsblIrOjqKgy5aKoJQj4O3EEtbPwhJbr6Te28CmdSKeqzeqr0YbfVIrTBKakvtOl5dtTkK+v4HfA9PEyBFCY9AGVgCBLaBp1jPAyfAJ/AAdIEG0dNAiyP7+K1qIfMdonZic6+WJoBJvQlvuwDqcXadUuqPA1NKAlexbRTAIMvMOCjTbMwl1LtI/6KWJ5Q6rT6Ht1MA58AX8Apcqqt5r2qhrgAXQC3CZ6i1+KMd9TRu3MvA3aH/fFPnBodb6oe6HM8+lYHrGdRXW8M9bMZtPXUji69lmf5Cmamq7quNLFZXD9Rq7v0Bpc1o/tp0fisAAAAASUVORK5CYII=)](https://marketplace.visualstudio.com/items?itemName=vscode-snippet.Snippet)
 
-A Visual Studio Code extension for [cht.sh](https://cht.sh/).  
+A Visual Studio Code extension for [cht.sh](https://cht.sh/).
 [Watch this lightning talk to learn more](https://www.youtube.com/watch?v=edGVRJf6uvg).
 
 ## Features
@@ -44,7 +44,7 @@ Marketplace](https://marketplace.visualstudio.com/items?itemName=vscode-snippet.
 
 ### Moving between answers
 
-Sometimes the first answer is not what you're looking for.  
+Sometimes the first answer is not what you're looking for.
 In that case, use `Snippet: Show next answer` and `Snippet: Show previous answer` to show alternative snippets.
 
 ### Search for snippet based on selected text
@@ -115,6 +115,11 @@ You can move snippets or folders in the Snippets view by dragging and dropping t
 
 ![Preview](https://raw.githubusercontent.com/mre/vscode-snippet/master/contrib/snippets-storage/move.gif)
 
+### IntelliSense
+
+Saved snippets are displayed in IntelliSense
+
+![Preview](https://raw.githubusercontent.com/mre/vscode-snippet/master/contrib/snippets-storage/intellisense.gif)
 
 ## Contributing
 

contrib/snippets-storage/intellisense.gif

@@ -2,7 +2,7 @@
   "name": "snippet",
   "displayName": "Snippet",
   "description": "Insert a snippet from cht.sh for Python, JavaScript, Ruby, C#, Go, Rust (and any other language)",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "publisher": "vscode-snippet",
   "engines": {
     "vscode": "^1.74.0"

package-lock.json

@@ -0,0 +1,56 @@
+import SnippetsStorage, { TreeElement } from "./snippetsStorage";
+import * as vscode from "vscode";
+
+export class CompletionManager {
+  constructor(
+    private readonly context: vscode.ExtensionContext,
+    private readonly snippets: SnippetsStorage,
+    private readonly registeredFileExtensions = new Set<string>()
+  ) {
+    for (const snippet of snippets.getSnippets()) {
+      this.ensureRegistered(snippet);
+    }
+
+    snippets.onSnippetSave = (snippet) => {
+      this.ensureRegistered(snippet);
+    };
+  }
+
+  private ensureRegistered(snippet: TreeElement): void {
+    const fileExtension = snippet.data.fileExtension;
+
+    if (!fileExtension) {
+      return;
+    }
+
+    if (this.registeredFileExtensions.has(fileExtension)) {
+      return;
+    }
+
+    const fileSelector: vscode.DocumentSelector = {
+      pattern: `**/*${fileExtension}`,
+    };
+    const provider = vscode.languages.registerCompletionItemProvider(
+      fileSelector,
+      ((snippets: SnippetsStorage) => ({
+        provideCompletionItems() {
+          const completions: vscode.CompletionItem[] = [];
+
+          for (const snippet of snippets.getSnippets()) {
+            if (snippet.data.fileExtension === fileExtension) {
+              const completion = new vscode.CompletionItem(snippet.data.label);
+              completion.insertText = snippet.data.content;
+              completion.detail = "[snippet]";
+              completion.documentation = snippet.data.content;
+              completions.push(completion);
+            }
+          }
+
+          return completions;
+        },
+      }))(this.snippets)
+    );
+    this.context.subscriptions.push(provider);
+    this.registeredFileExtensions.add(fileExtension);
+  }
+}

package.json

@@ -6,13 +6,15 @@ import SnippetProvider from "./provider";
 import * as endpoints from "./endpoints";
 import { SnippetsTreeProvider } from "./snippetsTreeProvider";
 import SnippetsStorage from "./snippetsStorage";
+import { CompletionManager } from "./completionManager";
 
 export function activate(ctx: vscode.ExtensionContext) {
   const snippetStorageKey = "snippet.snippetsStorageKey";
   ctx.globalState.setKeysForSync([snippetStorageKey]);
 
   const snippetsStorage = new SnippetsStorage(ctx, snippetStorageKey);
   const snippetsTreeProvider = new SnippetsTreeProvider(ctx, snippetsStorage);
+  new CompletionManager(ctx, snippetsStorage);
 
   vscode.commands.registerCommand("snippet.find", endpoints.findDefault);
   vscode.commands.registerCommand(

src/completionManager.ts

@@ -21,6 +21,7 @@ export interface FolderListItem extends vscode.QuickPickItem {
 
 export default class SnippetsStorage {
   public onSave?: () => void;
+  public onSnippetSave?: (snippet: TreeElement) => void;
   private readonly elements = new Map<string, TreeElement>();
   private rootId = "";
 
@@ -179,10 +180,12 @@ export default class SnippetsStorage {
       fileExtension,
     };
 
-    this.elements.set(data.id, { data, parentId });
+    const element: TreeElement = { data, parentId };
+    this.elements.set(data.id, element);
     this.getElement(parentId).childIds?.push(data.id);
 
     await this.save();
+    this.onSnippetSave?.(element);
   }
 
   getSnippet(id: string): string {
@@ -198,6 +201,14 @@ export default class SnippetsStorage {
     this.deserialize(this.context.globalState.get(this.storageKey) || "[]");
   }
 
+  *getSnippets(): IterableIterator<TreeElement> {
+    for (const element of this.elements.values()) {
+      if (!this.isFolder(element)) {
+        yield element;
+      }
+    }
+  }
+
   private async loadDefaultElements(): Promise<void> {
     const root: TreeElementData = {
       id: nanoid(),