WIP

Author: DanielNoord

pylint/lint/pylinter.py

@@ -938,7 +938,7 @@ def _check_astroid_module(
             if self._ignore_file:
                 return False
             # walk ast to collect line numbers
-            self.file_state.collect_block_lines(self.msgs_store, node)
+            # self.file_state.collect_block_lines(self.msgs_store, node)
             # run raw and tokens checkers
             for raw_checker in rawcheckers:
                 raw_checker.process_module(node)

pylint/utils/file_state.py

@@ -133,10 +133,12 @@ def _set_message_state_in_block(
             else:
                 first_ = lineno
                 last_ = last
+            if first_ < max(self._raw_module_msgs_state[msg.msgid]):
+                first_ = max(self._raw_module_msgs_state[msg.msgid])
+            if first_ == 1:
+                first_ = 0
             for line in range(first_, last_ + 1):
                 # do not override existing entries
-                if line in self._module_msgs_state.get(msg.msgid, ()):
-                    continue
                 if line in lines:  # state change in the same block
                     state = lines[line]
                     original_lineno = line
@@ -155,9 +157,13 @@ def set_msg_status(self, msg: MessageDefinition, line: int, status: bool) -> Non
         assert self._msgs_store
 
         try:
-            self._module_msgs_state[msg.msgid][line] = status
+            self._raw_module_msgs_state[msg.msgid][line] = status
         except KeyError:
-            self._module_msgs_state[msg.msgid] = {line: status}
+            self._raw_module_msgs_state[msg.msgid] = {line: status}
+
+        self._collect_block_lines(
+            self._msgs_store, self._module, {msg.msgid: {line: status}}
+        )
         print(self._module_msgs_state)
 
     def handle_ignored_message(