Show the warning highlight in the correct places in 8.7

the-lambda-church · Oct 30, 2017 · 1f7faaf · 1f7faaf
1 parent 1c93b1f
commit 1f7faaf
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/autoload/coqtop.py b/autoload/coqtop.py
@@ -307,6 +307,10 @@ def parse_feedback(self, xml):
         if xml.get("object") == "state":
             state_id = parse_value(xml.find("state_id"))
             comm = self.get_command_by_state_id(state_id)
+            if comm is None:
+                # coqtop must be sending feedback for a statement before it
+                # sent a reply to the Add command.
+                comm = self.get_command_by_state_id(None)
         else:
             edit_id = parse_value(xml.find("edit_id"))
             comm = self.get_command_by_edit(edit_id)
@@ -318,9 +322,11 @@ def parse_feedback(self, xml):
             level = level.get("val")
             if level == "error":
                 level = Command.ERROR
-            else:
+            elif level == "warning":
                 level = Command.WARNING
-            if comm:
+            else:
+                level = Command.NONE
+            if comm and level != Command.NONE:
                 comm.msg_type = level
                 # The element type is option
                 if messageNode[1].get("val") == "some":