WI #2636 Implement refactor/adjustFillers command (#2638)

TypeCobolTeam · Aug 6, 2024 · f965cf3 · f965cf3
1 parent 8cad7ab
commit f965cf3
Show file tree

Hide file tree

Showing 57 changed files with 561 additions and 310 deletions.
diff --git a/...eServerRobot.Installer/TypeCobol.LanguageServer.Test.LanguageServerRobot.Installer.csproj b/...eServerRobot.Installer/TypeCobol.LanguageServer.Test.LanguageServerRobot.Installer.csproj
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="TypeCobol.LanguageServer.Robot.Monitor" Version="1.5.0" />
-    <PackageReference Include="TypeCobol.LanguageServerRobot" Version="1.8.0" />
+    <PackageReference Include="TypeCobol.LanguageServer.Robot.Monitor" Version="1.5.1" />
+    <PackageReference Include="TypeCobol.LanguageServerRobot" Version="1.8.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/TypeCobol.LanguageServer.Test/LSRTest.cs b/TypeCobol.LanguageServer.Test/LSRTest.cs
@@ -557,5 +557,12 @@ public void CopyEditAddDataItem()
         {
             LSRTestHelper.Test("CopyEditAddDataItem", LsrTestingOptions.NoLsrTesting, true);
         }
+
+        [TestMethod]
+        [TestCategory("Refactorings")]
+        public void ExecuteCommandRefactorAdjustFillers()
+        {
+            LSRTestHelper.Test("ExecuteCommandRefactorAdjustFillers", LsrTestingOptions.NoLsrTesting);
+        }
     }
 }
diff --git a/...Server.Test/LSRTests/AmbiguousVariablesCompletion/input/AmbiguousVariablesCompletion.tlsp b/...Server.Test/LSRTests/AmbiguousVariablesCompletion/input/AmbiguousVariablesCompletion.tlsp
@@ -34,15 +34,15 @@
       "message": "{\"jsonrpc\":\"2.0\",\"method\":\"textDocument/publishDiagnostics\",\"params\":{\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/1/tcbl/TCOMFL061931428110445951281.cee\",\"diagnostics\":[{\"range\":{\"start\":{\"line\":14,\"character\":12},\"end\":{\"line\":14,\"character\":17}},\"severity\":1,\"code\":\"27\",\"source\":\"Find the syntax diagram describing the statement in error in the language reference\",\"message\":\"Syntax error : mismatched input 'GOBACK' expecting {alphanumeric literal, numeric literal, symbol, special register, figurative constant, keyword}\"}]}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"1\",\"result\":true}"
     },
     {
       "category": 0,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"method\":\"textDocument/completion\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/1/tcbl/TCOMFL061931428110445951281.cee\"},\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/1/tcbl/TCOMFL061931428110445951281.cee\",\"position\":{\"line\":12,\"character\":19}}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":[{\"label\":\"Group1 (Alphanumeric) (Group1)\",\"kind\":6,\"insertText\":\"Group1\"},{\"label\":\"Level1 (Alphanumeric) (Group1::Level1)\",\"kind\":6,\"insertText\":\"Group1::Level1\"},{\"label\":\"ambiguous (Alphanumeric) (Group1::Level1::ambiguous)\",\"kind\":6,\"insertText\":\"Group1::Level1::ambiguous\"},{\"label\":\"ambiguous (Alphanumeric) (Group1::Level2::ambiguous)\",\"kind\":6,\"insertText\":\"Group1::Level2::ambiguous\"},{\"label\":\"non-ambiguous-1 (Alphanumeric) (Group1::Level1::non-ambiguous-1)\",\"kind\":6,\"insertText\":\"Group1::Level1::non-ambiguous-1\"},{\"label\":\"Level2 (Alphanumeric) (Group1::Level2)\",\"kind\":6,\"insertText\":\"Group1::Level2\"},{\"label\":\"non-ambiguous-2 (Alphanumeric) (Group1::Level2::non-ambiguous-2)\",\"kind\":6,\"insertText\":\"Group1::Level2::non-ambiguous-2\"}]}"
     },
     {
@@ -66,15 +66,15 @@
       "message": "{\"jsonrpc\":\"2.0\",\"method\":\"textDocument/publishDiagnostics\",\"params\":{\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/1/tcbl/TCOMFL061931428110445951281.cee\",\"diagnostics\":[{\"range\":{\"start\":{\"line\":13,\"character\":20},\"end\":{\"line\":13,\"character\":22}},\"severity\":1,\"code\":\"30\",\"source\":\"Page\",\"message\":\"Semantic error: Symbol amb is not referenced\"}]}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"3\",\"result\":true}"
     },
     {
       "category": 0,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"method\":\"textDocument/completion\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/1/tcbl/TCOMFL061931428110445951281.cee\"},\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/1/tcbl/TCOMFL061931428110445951281.cee\",\"position\":{\"line\":12,\"character\":22}}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"result\":[{\"label\":\"ambiguous (Alphanumeric) (Group1::Level1::ambiguous)\",\"kind\":6,\"insertText\":\"Group1::Level1::ambiguous\",\"data\":{\"start\":{\"line\":12,\"character\":19},\"end\":{\"line\":12,\"character\":22}}},{\"label\":\"ambiguous (Alphanumeric) (Group1::Level2::ambiguous)\",\"kind\":6,\"insertText\":\"Group1::Level2::ambiguous\",\"data\":{\"start\":{\"line\":12,\"character\":19},\"end\":{\"line\":12,\"character\":22}}}]}"
     },
     {
@@ -110,15 +110,15 @@
       "message": "{\"jsonrpc\":\"2.0\",\"method\":\"textDocument/publishDiagnostics\",\"params\":{\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/1/tcbl/TCOMFL061931428110445951281.cee\",\"diagnostics\":[{\"range\":{\"start\":{\"line\":13,\"character\":20},\"end\":{\"line\":13,\"character\":22}},\"severity\":1,\"code\":\"30\",\"source\":\"Page\",\"message\":\"Semantic error: Symbol Lev is not referenced\"}]}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"5\",\"result\":true}"
     },
     {
       "category": 0,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"6\",\"method\":\"textDocument/completion\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/1/tcbl/TCOMFL061931428110445951281.cee\"},\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/1/tcbl/TCOMFL061931428110445951281.cee\",\"position\":{\"line\":12,\"character\":22}}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"6\",\"result\":[{\"label\":\"Level1 (Alphanumeric) (Group1::Level1)\",\"kind\":6,\"insertText\":\"Group1::Level1\",\"data\":{\"start\":{\"line\":12,\"character\":19},\"end\":{\"line\":12,\"character\":22}}},{\"label\":\"Level2 (Alphanumeric) (Group1::Level2)\",\"kind\":6,\"insertText\":\"Group1::Level2\",\"data\":{\"start\":{\"line\":12,\"character\":19},\"end\":{\"line\":12,\"character\":22}}}]}"
     }
   ],

diff --git a/...est/LSRTests/AmbiguousVariablesCompletionNoTC/input/AmbiguousVariablesCompletionNoTC.tlsp b/...est/LSRTests/AmbiguousVariablesCompletionNoTC/input/AmbiguousVariablesCompletionNoTC.tlsp
@@ -34,15 +34,15 @@
       "message": "{\"jsonrpc\":\"2.0\",\"method\":\"textDocument/publishDiagnostics\",\"params\":{\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/1/tcbl/TCOMFL061931428110445951281.cee\",\"diagnostics\":[{\"range\":{\"start\":{\"line\":14,\"character\":12},\"end\":{\"line\":14,\"character\":17}},\"severity\":1,\"code\":\"27\",\"source\":\"Find the syntax diagram describing the statement in error in the language reference\",\"message\":\"Syntax error : mismatched input 'GOBACK' expecting {alphanumeric literal, numeric literal, symbol, special register, figurative constant, keyword}\"}]}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"1\",\"result\":true}"
     },
     {
       "category": 0,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"method\":\"textDocument/completion\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/1/tcbl/TCOMFL061931428110445951281.cee\"},\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/1/tcbl/TCOMFL061931428110445951281.cee\",\"position\":{\"line\":12,\"character\":19}}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":[{\"label\":\"Group1 (Alphanumeric) (Group1)\",\"kind\":6,\"insertText\":\"Group1\"},{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\"},{\"label\":\"ambiguous (Alphanumeric) (ambiguous OF Level1 OF Group1)\",\"kind\":6,\"insertText\":\"ambiguous OF Level1 OF Group1\"},{\"label\":\"ambiguous (Alphanumeric) (ambiguous OF Level2 OF Group1)\",\"kind\":6,\"insertText\":\"ambiguous OF Level2 OF Group1\"},{\"label\":\"non-ambiguous-1 (Alphanumeric) (non-ambiguous-1)\",\"kind\":6,\"insertText\":\"non-ambiguous-1\"},{\"label\":\"Level2 (Alphanumeric) (Level2)\",\"kind\":6,\"insertText\":\"Level2\"},{\"label\":\"non-ambiguous-2 (Alphanumeric) (non-ambiguous-2)\",\"kind\":6,\"insertText\":\"non-ambiguous-2\"}]}"
     },
     {
@@ -66,15 +66,15 @@
       "message": "{\"jsonrpc\":\"2.0\",\"method\":\"textDocument/publishDiagnostics\",\"params\":{\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/1/tcbl/TCOMFL061931428110445951281.cee\",\"diagnostics\":[{\"range\":{\"start\":{\"line\":13,\"character\":20},\"end\":{\"line\":13,\"character\":22}},\"severity\":1,\"code\":\"30\",\"source\":\"Page\",\"message\":\"Semantic error: Symbol amb is not referenced\"}]}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"3\",\"result\":true}"
     },
     {
       "category": 0,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"method\":\"textDocument/completion\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/1/tcbl/TCOMFL061931428110445951281.cee\"},\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/1/tcbl/TCOMFL061931428110445951281.cee\",\"position\":{\"line\":12,\"character\":22}}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"result\":[{\"label\":\"ambiguous (Alphanumeric) (ambiguous OF Level1 OF Group1)\",\"kind\":6,\"insertText\":\"ambiguous OF Level1 OF Group1\",\"data\":{\"start\":{\"line\":12,\"character\":19},\"end\":{\"line\":12,\"character\":22}}},{\"label\":\"ambiguous (Alphanumeric) (ambiguous OF Level2 OF Group1)\",\"kind\":6,\"insertText\":\"ambiguous OF Level2 OF Group1\",\"data\":{\"start\":{\"line\":12,\"character\":19},\"end\":{\"line\":12,\"character\":22}}}]}"
     },
     {
@@ -110,15 +110,15 @@
       "message": "{\"jsonrpc\":\"2.0\",\"method\":\"textDocument/publishDiagnostics\",\"params\":{\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/1/tcbl/TCOMFL061931428110445951281.cee\",\"diagnostics\":[{\"range\":{\"start\":{\"line\":13,\"character\":20},\"end\":{\"line\":13,\"character\":22}},\"severity\":1,\"code\":\"30\",\"source\":\"Page\",\"message\":\"Semantic error: Symbol Lev is not referenced\"}]}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"5\",\"result\":true}"
     },
     {
       "category": 0,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"6\",\"method\":\"textDocument/completion\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/1/tcbl/TCOMFL061931428110445951281.cee\"},\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/1/tcbl/TCOMFL061931428110445951281.cee\",\"position\":{\"line\":12,\"character\":22}}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"6\",\"result\":[{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\",\"data\":{\"start\":{\"line\":12,\"character\":19},\"end\":{\"line\":12,\"character\":22}}},{\"label\":\"Level2 (Alphanumeric) (Level2)\",\"kind\":6,\"insertText\":\"Level2\",\"data\":{\"start\":{\"line\":12,\"character\":19},\"end\":{\"line\":12,\"character\":22}}}]}"
     }
   ],

diff --git a/TypeCobol.LanguageServer.Test/LSRTests/CfgDataInformation/input/CfgDataInformation.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/CfgDataInformation/input/CfgDataInformation.tlsp
@@ -46,7 +46,7 @@
       "message": "{\"jsonrpc\":\"2.0\",\"method\":\"typecobol/CfgDfa\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/MAYANJE/workspaces/runtime-GEFTest2/RemoteSystemsTempFiles/FttRemoteTempFiles/nitcpip.e-i.net/RE/RE.MAYANJE2.SOURCE/DVZZJCM6.cbl\"},\"dotContent\":\"digraph Cfg {\\r\\ncompound=true;\\r\\nnode [\\r\\nshape = \\\"record\\\"\\r\\n]\\r\\n\\r\\nedge [\\r\\narrowtail = \\\"empty\\\"\\r\\n]\\r\\nBlock0 [\\r\\nlabel = \\\"{START|}\\\"\\r\\n]\\r\\nBlock1 [\\r\\nlabel = \\\"{Block1|    PERFORM FctList-Process-Mode\\\\l}\\\"\\r\\n]\\r\\nsubgraph cluster_1{\\r\\ncolor = blue;\\r\\nlabel = \\\"FctList-Process-Mode\\\";\\r\\nBlock11 [\\r\\nlabel = \\\"{FCTLIST-PROCESS-MODE. Block11|    evaluate true\\\\l       when Fct-f1c0385c-StartCheckpoint\\\\l}\\\"\\r\\n]\\r\\nBlock12 [\\r\\nlabel = \\\"{Block12|          call 'f1c0385c' using arg1\\\\l}\\\"\\r\\n]\\r\\nBlock16 [\\r\\nlabel = \\\"{Block16|}\\\"\\r\\n]\\r\\nBlock13 [\\r\\nlabel = \\\"{Block13|}\\\"\\r\\n]\\r\\nBlock14 [\\r\\nlabel = \\\"{Block14|          Perform Handle-Error\\\\l}\\\"\\r\\n]\\r\\nsubgraph cluster_2{\\r\\ncolor = blue;\\r\\nlabel = \\\"Handle-Error\\\";\\r\\nBlock18 [\\r\\nlabel = \\\"{HANDLE-ERROR. Block18|    continue\\\\l}\\\"\\r\\n]\\r\\n\\r\\n}\\r\\nBlock14 -> Block18 [style=dashed]\\r\\n\\r\\nBlock15 [\\r\\nlabel = \\\"{Block15|}\\\"\\r\\n]\\r\\n\\r\\n}\\r\\nBlock1 -> Block11 [style=dashed]\\r\\n\\r\\nBlock2 [\\r\\nlabel = \\\"{Block2|    GOBACK\\\\l}\\\"\\r\\n]\\r\\nBlock0 -> Block1\\r\\nBlock11 -> Block12\\r\\nBlock11 -> Block13\\r\\nBlock12 -> Block16\\r\\nBlock13 -> Block14\\r\\nBlock14 -> Block15\\r\\nBlock15 -> Block16\\r\\nBlock1 -> Block2\\r\\n\\r\\n}\\r\\n\",\"instructionPositions\":[{\"line\":23,\"character\":11},{\"line\":24,\"character\":14},{\"line\":25,\"character\":17},{\"line\":31,\"character\":11},{\"line\":27,\"character\":17},{\"line\":19,\"character\":11},{\"line\":20,\"character\":11}],\"basicBlockInfos\":[{\"id\":0,\"subgraphId\":-1,\"fstInstIdx\":-1,\"lstInstIdx\":-1},{\"id\":11,\"subgraphId\":1,\"fstInstIdx\":0,\"lstInstIdx\":2},{\"id\":12,\"subgraphId\":1,\"fstInstIdx\":2,\"lstInstIdx\":3},{\"id\":16,\"subgraphId\":1,\"fstInstIdx\":-1,\"lstInstIdx\":-1},{\"id\":13,\"subgraphId\":1,\"fstInstIdx\":-1,\"lstInstIdx\":-1},{\"id\":18,\"subgraphId\":2,\"fstInstIdx\":3,\"lstInstIdx\":4},{\"id\":14,\"subgraphId\":1,\"fstInstIdx\":4,\"lstInstIdx\":5},{\"id\":15,\"subgraphId\":1,\"fstInstIdx\":-1,\"lstInstIdx\":-1},{\"id\":1,\"subgraphId\":-1,\"fstInstIdx\":5,\"lstInstIdx\":6},{\"id\":2,\"subgraphId\":-1,\"fstInstIdx\":6,\"lstInstIdx\":7}]}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"1\",\"result\":true}"
     }
   ],

diff --git a/TypeCobol.LanguageServer.Test/LSRTests/CompletionAfterAddTo/input/CompletionAfterAddTo.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/CompletionAfterAddTo/input/CompletionAfterAddTo.tlsp
@@ -38,7 +38,7 @@
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"1\",\"method\":\"textDocument/completion\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/2/tcbl/TCOMFL062610805482392753007.cee\"},\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/2/tcbl/TCOMFL062610805482392753007.cee\",\"position\":{\"line\":7,\"character\":20}}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"1\",\"result\":[{\"label\":\"var1 (Alphanumeric) (var1)\",\"kind\":6,\"insertText\":\"var1\"},{\"label\":\"var2 (Numeric) (var2)\",\"kind\":6,\"insertText\":\"var2\"}]}"
     }
   ],

diff --git a/...Server.Test/LSRTests/CompletionAfterBetweenColons/input/CompletionAfterBetweenColons.tlsp b/...Server.Test/LSRTests/CompletionAfterBetweenColons/input/CompletionAfterBetweenColons.tlsp
@@ -34,15 +34,15 @@
       "message": "{\"jsonrpc\":\"2.0\",\"method\":\"textDocument/publishDiagnostics\",\"params\":{\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/2/tcbl/DVZZMFT24107591944719116636.cee\",\"diagnostics\":[{\"range\":{\"start\":{\"line\":17,\"character\":21},\"end\":{\"line\":17,\"character\":21}},\"severity\":1,\"code\":\"27\",\"source\":\"Find the syntax diagram describing the statement in error in the language reference\",\"message\":\"Syntax error : mismatched input ':' expecting TO\"}]}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"1\",\"result\":true}"
     },
     {
       "category": 0,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"method\":\"textDocument/completion\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/2/tcbl/DVZZMFT24107591944719116636.cee\"},\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/2/tcbl/DVZZMFT24107591944719116636.cee\",\"position\":{\"line\":16,\"character\":21}}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":[]}"
     },
     {
@@ -70,15 +70,15 @@
       "message": "{\"jsonrpc\":\"2.0\",\"method\":\"textDocument/publishDiagnostics\",\"params\":{\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/2/tcbl/DVZZMFT24107591944719116636.cee\",\"diagnostics\":[]}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"3\",\"result\":true}"
     },
     {
       "category": 0,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"method\":\"textDocument/completion\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/2/tcbl/DVZZMFT24107591944719116636.cee\"},\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/2/tcbl/DVZZMFT24107591944719116636.cee\",\"position\":{\"line\":17,\"character\":31}}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"result\":[]}"
     },
     {
@@ -106,15 +106,15 @@
       "message": "{\"jsonrpc\":\"2.0\",\"method\":\"textDocument/publishDiagnostics\",\"params\":{\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/2/tcbl/DVZZMFT24107591944719116636.cee\",\"diagnostics\":[{\"range\":{\"start\":{\"line\":20,\"character\":12},\"end\":{\"line\":20,\"character\":12}},\"severity\":1,\"code\":\"27\",\"source\":\"Find the syntax diagram describing the statement in error in the language reference\",\"message\":\"Syntax error : mismatched input '.' expecting TO\"},{\"range\":{\"start\":{\"line\":19,\"character\":25},\"end\":{\"line\":19,\"character\":26}},\"severity\":1,\"code\":\"27\",\"source\":\"Find the syntax diagram describing the statement in error in the language reference\",\"message\":\"Syntax error : extraneous input '::' expecting user defined word\"}]}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"5\",\"result\":true}"
     },
     {
       "category": 0,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"6\",\"method\":\"textDocument/completion\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/2/tcbl/DVZZMFT24107591944719116636.cee\"},\"uri\":\"file:/C:/Users/MILLETFL/AppData/Local/Temp/2/tcbl/DVZZMFT24107591944719116636.cee\",\"position\":{\"line\":18,\"character\":24}}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"6\",\"result\":[]}"
     },
     {

diff --git a/...LSRTests/CompletionAfterDotFromTypedDataDef/input/CompletionAfterDotFromTypedDataDef.tlsp b/...LSRTests/CompletionAfterDotFromTypedDataDef/input/CompletionAfterDotFromTypedDataDef.tlsp
@@ -26,7 +26,7 @@
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"3\",\"method\":\"textDocument/completion\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/LANOYDO/AppData/Local/Temp/1/tcbl/DVZZDLY13205826092725044692.cee\"},\"uri\":\"file:/C:/Users/LANOYDO/AppData/Local/Temp/1/tcbl/DVZZDLY13205826092725044692.cee\",\"position\":{\"line\":4,\"character\":42}}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"3\",\"result\":[]}"
     },
     {
@@ -38,7 +38,7 @@
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"method\":\"textDocument/completion\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/LANOYDO/AppData/Local/Temp/1/tcbl/DVZZDLY13205826092725044692.cee\"},\"uri\":\"file:/C:/Users/LANOYDO/AppData/Local/Temp/1/tcbl/DVZZDLY13205826092725044692.cee\",\"position\":{\"line\":16,\"character\":49}}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"result\":[{\"label\":\"Data1 (Alphanumeric) (Data1)\",\"kind\":6,\"insertText\":\"Data1\"},{\"label\":\"ListIdx (Numeric) (ListIdx)\",\"kind\":6,\"insertText\":\"ListIdx\"}]}"
     },
     {

diff --git a/TypeCobol.LanguageServer.Test/LSRTests/CompletionAfterWhen/input/CompletionAfterWhen.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/CompletionAfterWhen/input/CompletionAfterWhen.tlsp
@@ -38,7 +38,7 @@
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"1\",\"method\":\"textDocument/completion\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/MAYANJE/workspaces/RDz4EIv72_workspaceUAT/RemoteSystemsTempFiles/FttRemoteTempFiles/nitcpip.e-i.net/ED/ED.ADYTCOB.SOURCE/TCOJCM02.cbl\"},\"uri\":\"file:/C:/Users/MAYANJE/workspaces/RDz4EIv72_workspaceUAT/RemoteSystemsTempFiles/FttRemoteTempFiles/nitcpip.e-i.net/ED/ED.ADYTCOB.SOURCE/TCOJCM02.cbl\",\"position\":{\"line\":12,\"character\":20}}}"
     },
     {
-      "category": 2,
+      "category": 1,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"1\",\"result\":[{\"label\":\"W-OPTION (Alphanumeric) (W-OPTION)\",\"kind\":6,\"insertText\":\"W-OPTION\"},{\"label\":\"W-OPTION-1 (Level88) (W-OPTION::W-OPTION-1)\",\"kind\":6,\"insertText\":\"W-OPTION::W-OPTION-1\"},{\"label\":\"W-OPTION-2 (Level88) (W-OPTION::W-OPTION-2)\",\"kind\":6,\"insertText\":\"W-OPTION::W-OPTION-2\"}]}"
     }
   ],