Merge branch 'staging' into refactor/import-suggestions

Author: PraneshASP

package.json

@@ -2,7 +2,7 @@
   "name": "vscode-solidity-inspector",
   "displayName": "Solidity Inspector",
   "description": "A vscode extension used to inspect Solidity files",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "engines": {
     "vscode": "^1.72.0"
   },
@@ -12,8 +12,9 @@
   "keywords": [
     "ethereum",
     "solidity",
-    "solidity-inspector",
-    "forge-inspector"
+    "blockchain",
+    "EVM",
+    "smart-contracts"
   ],
   "publisher": "PraneshASP",
   "homepage": "https://github.com/PraneshASP/vscode-solidity-inspector",

src/commands/separator.js

@@ -0,0 +1,48 @@
+const vscode = require("vscode");
+
+function createSeparator(style) {
+    if (style === 'solmate') {
+        return `    /*//////////////////////////////////////////////////////////////
+                                \${1:PLACEHOLDER}
+    //////////////////////////////////////////////////////////////*/\n`;
+    } else { 
+        return `    /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
+    /*                         \${1:PLACEHOLDER}                        */
+    /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/\n`;
+    }
+}
+
+function provideCompletionItemsForSeparator(document, position) {
+    const linePrefix = document.lineAt(position).text.substr(0, position.character);
+
+    if (linePrefix.endsWith('////')) {
+        const soladyItem = new vscode.CompletionItem('Solady Separator', vscode.CompletionItemKind.Snippet);
+        soladyItem.insertText = new vscode.SnippetString(createSeparator('solady'));
+        soladyItem.detail = "Insert a Solady style separator \n" + createSeparator('solady');
+        soladyItem.additionalTextEdits = [vscode.TextEdit.delete(new vscode.Range(position.translate(0, -4), position))];
+
+        const solmateItem = new vscode.CompletionItem('Solmate Separator', vscode.CompletionItemKind.Snippet);
+        solmateItem.insertText = new vscode.SnippetString(createSeparator('solmate'));
+        solmateItem.detail = "Insert a Solmate style separator \n" + createSeparator('solmate');
+        solmateItem.additionalTextEdits = [vscode.TextEdit.delete(new vscode.Range(position.translate(0, -4), position))];
+
+        return [soladyItem, solmateItem];
+    }
+
+    return undefined;
+}
+
+function activate(context) {
+    context.subscriptions.push(
+        vscode.languages.registerCompletionItemProvider(
+            { language: 'solidity', scheme: 'file' },
+            { provideCompletionItems: provideCompletionItemsForSeparator },
+            '/'
+        )
+    );
+}
+
+module.exports = {
+    activate,
+    provideCompletionItemsForSeparator
+};

src/extension.js

@@ -42,6 +42,7 @@ const { scaffoldActiveFile, scaffoldContextMenu } = require("./commands/bulloak-
 
 const { provideCompletionItems, resetRemappings } = require("./completionItems.js");
 
+const { activate: activateSeparator } = require("./commands/separator.js");
 
 /** global vars */
 const EXTENSION_PREFIX = "vscode-solidity-inspector";
@@ -152,20 +153,22 @@ function onActivate(context) {
   context.subscriptions.push(scaffoldActiveFileSubscription);
   context.subscriptions.push(scaffoldContextMenuSubscription);
 
-
   // Import suggestions. 
   context.subscriptions.push(vscode.languages.registerCompletionItemProvider('solidity', { provideCompletionItems }, ['"', "{"]));
   context.subscriptions.push(vscode.commands.registerCommand(EXTENSION_PREFIX + '.resetRemappings', () => {
     resetRemappings();
     vscode.window.showInformationMessage('Remappings have been refreshed!');
   }));
-
+ 
   vscode.window.visibleTextEditors.map(editor => {
     if (editor && editor.document && editor.document.languageId == "solidity") {
       unusedImportsActiveFile(editor);
     }
   });
 
+  // Activate separator
+  activateSeparator(context);
+
 }