fix

one-ware · Nov 19, 2023 · b9742dd · b9742dd
1 parent ebf23b5
commit b9742dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/OneWare.Verilog/TypeAssistanceVerilog.cs b/src/OneWare.Verilog/TypeAssistanceVerilog.cs
@@ -25,12 +25,11 @@ public override async Task<List<CompletionData>> GetCustomCompletionItemsAsync()
             var items = new List<CompletionData>();
 
             var text = Editor.CurrentDocument.Text;
-            var usedWords = await Task.Run(() => _usedWordsRegex.Matches(text));
+            var usedWords = await Task.Run(() => _usedWordsRegex.Matches(text).Select(x => x.ToString()).Distinct());
 
             foreach (var word in usedWords)
             {
-                if(word.ToString() is { } s)
-                    items.Add(new CompletionData(s, s, "Used word in document", TypeAssistanceIconStore.Instance.Icons[CompletionItemKind.Snippet], 0, CodeBox.CaretOffset));
+                items.Add(new CompletionData(word, word, "Used word in document", TypeAssistanceIconStore.Instance.Icons[CompletionItemKind.Snippet], 0, CodeBox.CaretOffset));
             }
 
             return items;
@@ -41,7 +40,7 @@ public override void TypeAssistance(TextInputEventArgs e)
             if ((e.Text?.Contains(';') ?? false) && Service.IsLanguageServiceReady)
             {
                 var line = CodeBox.Document.GetLineByOffset(CodeBox.CaretOffset).LineNumber;
-                AutoIndent(line, line);
+                //AutoIndent(line, line);
             }
         }
     }

diff --git a/src/OneWare.Vhdl/TypeAssistanceVhdl.cs b/src/OneWare.Vhdl/TypeAssistanceVhdl.cs
@@ -27,7 +27,6 @@ public override async Task<List<CompletionData>> GetCustomCompletionItemsAsync()
             var items = new List<CompletionData>();
 
             var text = Editor.CurrentDocument.Text;
-            var usedWords = await Task.Run(() => _usedWordsRegex.Matches(text).Select(x => x.ToString()).Distinct());
 
             items.Add(new CompletionData("library IEEE;\nuse IEEE.std_logic_1164.all;\nuse IEEE.numeric_std.all; ",
                 "ieee", "IEEE Standard Packages",
@@ -39,6 +38,8 @@ public override async Task<List<CompletionData>> GetCustomCompletionItemsAsync()
                 Path.GetFileNameWithoutExtension(Editor.CurrentFile.Header) + ";", "entity", "Entity Declaration",
                 TypeAssistanceIconStore.Instance.Icons[CompletionItemKind.Class], 0, CodeBox.CaretOffset));
 
+            var usedWords = await Task.Run(() => _usedWordsRegex.Matches(text).Select(x => x.ToString()).Distinct());
+
             foreach (var word in usedWords)
             {
                 items.Add(new CompletionData(word, word, "Used word in document", TypeAssistanceIconStore.Instance.Icons[CompletionItemKind.Snippet], 0, CodeBox.CaretOffset));