Minor refactoring of new semantic analyzer and daemon (#6837)

Author: JukkaL

mypy/newsemanal/semanal.py

@@ -2580,7 +2580,7 @@ def analyze_member_lvalue(self, lval: MemberExpr, explicit_type: bool, is_final:
         lval.accept(self)
         if self.is_self_member_ref(lval):
             assert self.type, "Self member outside a class"
-            cur_node = self.type.names.get(lval.name, None)
+            cur_node = self.type.names.get(lval.name)
             node = self.type.get(lval.name)
             if cur_node and is_final:
                 # Overrides will be checked in type checker.
@@ -2591,11 +2591,12 @@ def analyze_member_lvalue(self, lval: MemberExpr, explicit_type: bool, is_final:
                     cur_node.node.is_inferred and explicit_type):
                 self.attribute_already_defined(lval.name, lval, cur_node)
             # If the attribute of self is not defined in superclasses, create a new Var, ...
-            if ((node is None or isinstance(node.node, Var) and node.node.is_abstract_var) or
+            if (node is None
+                    or (isinstance(node.node, Var) and node.node.is_abstract_var)
                     # ... also an explicit declaration on self also creates a new Var.
                     # Note that `explicit_type` might has been erased for bare `Final`,
                     # so we also check if `is_final` is passed.
-                    (cur_node is None and (explicit_type or is_final))):
+                    or (cur_node is None and (explicit_type or is_final))):
                 if self.type.is_protocol and node is None:
                     self.fail("Protocol members cannot be defined via assignment to self", lval)
                 else:

mypy/newsemanal/semanal_main.py

@@ -96,8 +96,8 @@ def cleanup_builtin_scc(state: 'State') -> None:
     remove_imported_names_from_symtable(state.tree.names, 'builtins')
 
 
-def process_selected_targets(state: 'State', nodes: List[FineGrainedDeferredNode],
-                             graph: 'Graph', strip_patches: List[Callable[[], None]]) -> None:
+def semantic_analysis_for_targets(state: 'State', nodes: List[FineGrainedDeferredNode],
+                                  graph: 'Graph', strip_patches: List[Callable[[], None]]) -> None:
     """Semantically analyze only selected nodes in a given module.
 
     This essentially mirrors the logic of semantic_analysis_for_scc()

mypy/server/update.py

@@ -136,7 +136,7 @@
 from mypy.server.astdiff import (
     snapshot_symbol_table, compare_symbol_table_snapshots, SnapshotItem
 )
-from mypy.newsemanal.semanal_main import semantic_analysis_for_scc, process_selected_targets
+from mypy.newsemanal.semanal_main import semantic_analysis_for_scc, semantic_analysis_for_targets
 from mypy.server.astmerge import merge_asts
 from mypy.server.aststrip import strip_target
 from mypy.server.aststripnew import strip_target_new
@@ -955,7 +955,7 @@ def key(node: FineGrainedDeferredNode) -> int:
     if not options.new_semantic_analyzer:
         re_analyze_nodes(file_node, nodes, manager, options)
     else:
-        process_selected_targets(graph[module_id], nodes, graph, patches)
+        semantic_analysis_for_targets(graph[module_id], nodes, graph, patches)
     # Merge symbol tables to preserve identities of AST nodes. The file node will remain
     # the same, but other nodes may have been recreated with different identities, such as
     # NamedTuples defined using assignment statements.