Add comment detection in providing doxygen command (#229)

2 files changed, 13 insertions, 7 deletions

diff --git a/src/DoxygenCompletionItemProvider.ts b/src/DoxygenCompletionItemProvider.ts
index b71b827..160158c 100644
--- a/src/DoxygenCompletionItemProvider.ts
+++ b/src/DoxygenCompletionItemProvider.ts
@@ -1,4 +1,5 @@
 import * as vscode from "vscode";
+import { inComment } from "./util";
 
 // tslint:disable:max-line-length
 
@@ -115,8 +116,10 @@ export default class DoxygenCompletionItemProvider implements vscode.CompletionI
     ];
     public static completionItems = (() => {
         const items: vscode.CompletionItem[] = [];
+        const addPrefix = vscode.workspace.getConfiguration("doxdocgen.generic").get<boolean>("commandSuggestionAddPrefix");
         for (const item of DoxygenCompletionItemProvider.commands) {
-            const newItem = new vscode.CompletionItem(item[0]);
+            // TODO: Only \ can be used, @ as label prefix causes unexpected filtering
+            const newItem = new vscode.CompletionItem(addPrefix ? `\\${item[0]}` : item[0]);
             newItem.documentation = new vscode.MarkdownString(item[2]);
             newItem.insertText = new vscode.SnippetString(`${item[0]} ${item[1]}`);
             newItem.kind = vscode.CompletionItemKind.Snippet;
@@ -128,10 +131,12 @@ export default class DoxygenCompletionItemProvider implements vscode.CompletionI
     public trigger: string = "";
     public indentSpace: number;
     public provideCompletionItems(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken, context: vscode.CompletionContext) {
-        this.trigger = context.triggerCharacter;
-        this.indentSpace = position.character;
-        // TODO: check if current position is comment
-        return DoxygenCompletionItemProvider.completionItems;
+        if (inComment(vscode.window.activeTextEditor, position.line + 1)) {
+            this.trigger = context.triggerCharacter;
+            this.indentSpace = position.character;
+            return DoxygenCompletionItemProvider.completionItems;
+        }
+        return [];
     }
 
     public resolveCompletionItem(item: vscode.CompletionItem, token: vscode.CancellationToken) {
diff --git a/src/util.ts b/src/util.ts
index f2068e7..f6e429a 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -2,9 +2,10 @@ import * as env from "env-var";
 import * as vscode from "vscode";
 
 /**
- * Check if a specific line is inside a comment block
+ * Check if a specific line will be inside a comment block if comment block is inserted,
+ * that is a line before the active line
  * @param activeEditor the active editor
- * @param activeLine the line number to be checked
+ * @param activeLine the !previous! line to be checked
  */
 export function inComment(activeEditor: vscode.TextEditor, activeLine: number): boolean {
     if (activeLine === 0) {