fix codeactions for switch statements

Fix handling nulls and associating with diagnostic messages.
vala-lang · Nov 25, 2022 · 7e6b401 · 7e6b401
1 parent 23b6397
commit 7e6b401
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/codeaction/adddefaulttoswitchaction.vala b/src/codeaction/adddefaulttoswitchaction.vala
@@ -70,9 +70,9 @@ class Vls.AddDefaultToSwitchAction : CodeAction {
 
         // now, include all relevant diagnostics
         foreach (var diag in context.diagnostics)
-            if (diag.message.contains ("does not handle"))
+            if (diag.message.contains ("Switch does not handle"))
                 add_diagnostic (diag);
-        if (!diagnostics.is_empty)
+        if (diagnostics != null && !diagnostics.is_empty)
             this.kind = "quickfix";
         else
             this.kind = "refactor.rewrite";

diff --git a/src/codeaction/addotherconstantstoswitchaction.vala b/src/codeaction/addotherconstantstoswitchaction.vala
@@ -81,9 +81,9 @@ class Vls.AddOtherConstantsToSwitchAction : CodeAction {
         this.edit.documentChanges = new ArrayList<TextDocumentEdit>.wrap ({document_edit});
         // now, include all relevant diagnostics
         foreach (var diag in context.diagnostics)
-            if (/does not implement|some prerequisites .*are not met/.match (diag.message))
+            if (diag.message.contains ("Switch does not handle"))
                 add_diagnostic (diag);
-        if (!diagnostics.is_empty)
+        if (diagnostics != null && !diagnostics.is_empty)
             this.kind = "quickfix";
         else
             this.kind = "refactor.rewrite";