python: execute 'black'

1 files changed, 98 insertions, 83 deletions

diff --git a/python/vhdl_langserver/symbols.py b/python/vhdl_langserver/symbols.py
index 11335408c..d0bd269de 100644
--- a/python/vhdl_langserver/symbols.py
+++ b/python/vhdl_langserver/symbols.py
@@ -8,63 +8,69 @@ import libghdl.thin.vhdl.elocations as elocations
 from . import lsp
 
 SYMBOLS_MAP = {
-    nodes.Iir_Kind.Package_Declaration: {'kind': lsp.SymbolKind.Package, 'detail': '(declaration)'},
-    nodes.Iir_Kind.Package_Body: {'kind': lsp.SymbolKind.Package, 'detail': '(body)'},
-    nodes.Iir_Kind.Entity_Declaration: {'kind': lsp.SymbolKind.Module},
-    nodes.Iir_Kind.Architecture_Body:  {'kind': lsp.SymbolKind.Module},
-    nodes.Iir_Kind.Configuration_Declaration:  {'kind': lsp.SymbolKind.Module},
-    nodes.Iir_Kind.Package_Instantiation_Declaration: {'kind': lsp.SymbolKind.Module},
-    nodes.Iir_Kind.Component_Declaration: {'kind': lsp.SymbolKind.Module},
-    nodes.Iir_Kind.Context_Declaration: {'kind': lsp.SymbolKind.Module},
-    nodes.Iir_Kind.Use_Clause: {'kind': None},
-    nodes.Iir_Kind.Library_Clause: {'kind': None},
-    nodes.Iir_Kind.Procedure_Declaration: {'kind': lsp.SymbolKind.Function},
-    nodes.Iir_Kind.Function_Declaration: {'kind': lsp.SymbolKind.Function},
-    nodes.Iir_Kind.Interface_Procedure_Declaration: {'kind': lsp.SymbolKind.Function},
-    nodes.Iir_Kind.Interface_Function_Declaration: {'kind': lsp.SymbolKind.Function},
-    nodes.Iir_Kind.Procedure_Body: {'kind': lsp.SymbolKind.Function, 'detail': '(body)'},
-    nodes.Iir_Kind.Function_Body: {'kind': lsp.SymbolKind.Function, 'detail': '(body)'},
-    nodes.Iir_Kind.Type_Declaration: {'kind': lsp.SymbolKind.Constructor},
-    nodes.Iir_Kind.Subtype_Declaration: {'kind': lsp.SymbolKind.Constructor},
-    nodes.Iir_Kind.Attribute_Declaration: {'kind': lsp.SymbolKind.Property},
-    nodes.Iir_Kind.Attribute_Specification: {'kind': None},
-    nodes.Iir_Kind.Disconnection_Specification: {'kind': None},
-    nodes.Iir_Kind.Anonymous_Type_Declaration: {'kind': None},
-    nodes.Iir_Kind.Variable_Declaration: {'kind': lsp.SymbolKind.Variable},
-    nodes.Iir_Kind.Constant_Declaration: {'kind': lsp.SymbolKind.Constant},
-    nodes.Iir_Kind.Signal_Declaration: {'kind': lsp.SymbolKind.Variable},
-    nodes.Iir_Kind.Signal_Attribute_Declaration: {'kind': None},
-    nodes.Iir_Kind.File_Declaration: {'kind': lsp.SymbolKind.File},
-    nodes.Iir_Kind.Interface_Variable_Declaration: {'kind': lsp.SymbolKind.Variable},
-    nodes.Iir_Kind.Interface_Constant_Declaration: {'kind': lsp.SymbolKind.Constant},
-    nodes.Iir_Kind.Interface_Signal_Declaration: {'kind': lsp.SymbolKind.Variable},
-    nodes.Iir_Kind.Interface_File_Declaration: {'kind': lsp.SymbolKind.Variable},
-    nodes.Iir_Kind.File_Declaration: {'kind': lsp.SymbolKind.File},
-    nodes.Iir_Kind.Object_Alias_Declaration:  {'kind': lsp.SymbolKind.Variable},
-    nodes.Iir_Kind.Non_Object_Alias_Declaration: {'kind': lsp.SymbolKind.Variable},
-    nodes.Iir_Kind.Protected_Type_Body: {'kind': lsp.SymbolKind.Class},
-    nodes.Iir_Kind.Group_Template_Declaration: {'kind': lsp.SymbolKind.Variable},
-    nodes.Iir_Kind.Group_Declaration: {'kind': lsp.SymbolKind.Variable},
-    nodes.Iir_Kind.Concurrent_Simple_Signal_Assignment: {'kind': None},
-    nodes.Iir_Kind.Concurrent_Conditional_Signal_Assignment: {'kind': None},
-    nodes.Iir_Kind.Concurrent_Selected_Signal_Assignment: {'kind': None},
-    nodes.Iir_Kind.Concurrent_Procedure_Call_Statement: {'kind': None},
-    nodes.Iir_Kind.Concurrent_Assertion_Statement: {'kind': None},
-    nodes.Iir_Kind.Component_Instantiation_Statement: {'kind': lsp.SymbolKind.Method},
-    nodes.Iir_Kind.Block_Statement: {'kind': lsp.SymbolKind.Method},
-    nodes.Iir_Kind.If_Generate_Statement: {'kind': lsp.SymbolKind.Method},
-    nodes.Iir_Kind.For_Generate_Statement: {'kind': lsp.SymbolKind.Method},
-    nodes.Iir_Kind.Case_Generate_Statement: {'kind': lsp.SymbolKind.Method},
-    nodes.Iir_Kind.Sensitized_Process_Statement: {'kind': lsp.SymbolKind.Method},
-    nodes.Iir_Kind.Process_Statement: {'kind': lsp.SymbolKind.Method},
-    nodes.Iir_Kind.Psl_Assert_Directive: {'kind': lsp.SymbolKind.Method},
-    nodes.Iir_Kind.Psl_Assume_Directive: {'kind': lsp.SymbolKind.Method},
-    nodes.Iir_Kind.Psl_Cover_Directive: {'kind': lsp.SymbolKind.Method},
-    nodes.Iir_Kind.Psl_Restrict_Directive: {'kind': lsp.SymbolKind.Method},
-    nodes.Iir_Kind.Psl_Endpoint_Declaration: {'kind': lsp.SymbolKind.Variable},
-    nodes.Iir_Kind.Psl_Declaration: {'kind': lsp.SymbolKind.Variable},
-    nodes.Iir_Kind.Psl_Assert_Directive: {'kind': lsp.SymbolKind.Method},
-    nodes.Iir_Kind.Configuration_Specification: {'kind': None},
+    nodes.Iir_Kind.Package_Declaration: {
+        "kind": lsp.SymbolKind.Package,
+        "detail": "(declaration)",
+    },
+    nodes.Iir_Kind.Package_Body: {"kind": lsp.SymbolKind.Package, "detail": "(body)"},
+    nodes.Iir_Kind.Entity_Declaration: {"kind": lsp.SymbolKind.Module},
+    nodes.Iir_Kind.Architecture_Body: {"kind": lsp.SymbolKind.Module},
+    nodes.Iir_Kind.Configuration_Declaration: {"kind": lsp.SymbolKind.Module},
+    nodes.Iir_Kind.Package_Instantiation_Declaration: {"kind": lsp.SymbolKind.Module},
+    nodes.Iir_Kind.Component_Declaration: {"kind": lsp.SymbolKind.Module},
+    nodes.Iir_Kind.Context_Declaration: {"kind": lsp.SymbolKind.Module},
+    nodes.Iir_Kind.Use_Clause: {"kind": None},
+    nodes.Iir_Kind.Library_Clause: {"kind": None},
+    nodes.Iir_Kind.Procedure_Declaration: {"kind": lsp.SymbolKind.Function},
+    nodes.Iir_Kind.Function_Declaration: {"kind": lsp.SymbolKind.Function},
+    nodes.Iir_Kind.Interface_Procedure_Declaration: {"kind": lsp.SymbolKind.Function},
+    nodes.Iir_Kind.Interface_Function_Declaration: {"kind": lsp.SymbolKind.Function},
+    nodes.Iir_Kind.Procedure_Body: {
+        "kind": lsp.SymbolKind.Function,
+        "detail": "(body)",
+    },
+    nodes.Iir_Kind.Function_Body: {"kind": lsp.SymbolKind.Function, "detail": "(body)"},
+    nodes.Iir_Kind.Type_Declaration: {"kind": lsp.SymbolKind.Constructor},
+    nodes.Iir_Kind.Subtype_Declaration: {"kind": lsp.SymbolKind.Constructor},
+    nodes.Iir_Kind.Attribute_Declaration: {"kind": lsp.SymbolKind.Property},
+    nodes.Iir_Kind.Attribute_Specification: {"kind": None},
+    nodes.Iir_Kind.Disconnection_Specification: {"kind": None},
+    nodes.Iir_Kind.Anonymous_Type_Declaration: {"kind": None},
+    nodes.Iir_Kind.Variable_Declaration: {"kind": lsp.SymbolKind.Variable},
+    nodes.Iir_Kind.Constant_Declaration: {"kind": lsp.SymbolKind.Constant},
+    nodes.Iir_Kind.Signal_Declaration: {"kind": lsp.SymbolKind.Variable},
+    nodes.Iir_Kind.Signal_Attribute_Declaration: {"kind": None},
+    nodes.Iir_Kind.File_Declaration: {"kind": lsp.SymbolKind.File},
+    nodes.Iir_Kind.Interface_Variable_Declaration: {"kind": lsp.SymbolKind.Variable},
+    nodes.Iir_Kind.Interface_Constant_Declaration: {"kind": lsp.SymbolKind.Constant},
+    nodes.Iir_Kind.Interface_Signal_Declaration: {"kind": lsp.SymbolKind.Variable},
+    nodes.Iir_Kind.Interface_File_Declaration: {"kind": lsp.SymbolKind.Variable},
+    nodes.Iir_Kind.File_Declaration: {"kind": lsp.SymbolKind.File},
+    nodes.Iir_Kind.Object_Alias_Declaration: {"kind": lsp.SymbolKind.Variable},
+    nodes.Iir_Kind.Non_Object_Alias_Declaration: {"kind": lsp.SymbolKind.Variable},
+    nodes.Iir_Kind.Protected_Type_Body: {"kind": lsp.SymbolKind.Class},
+    nodes.Iir_Kind.Group_Template_Declaration: {"kind": lsp.SymbolKind.Variable},
+    nodes.Iir_Kind.Group_Declaration: {"kind": lsp.SymbolKind.Variable},
+    nodes.Iir_Kind.Concurrent_Simple_Signal_Assignment: {"kind": None},
+    nodes.Iir_Kind.Concurrent_Conditional_Signal_Assignment: {"kind": None},
+    nodes.Iir_Kind.Concurrent_Selected_Signal_Assignment: {"kind": None},
+    nodes.Iir_Kind.Concurrent_Procedure_Call_Statement: {"kind": None},
+    nodes.Iir_Kind.Concurrent_Assertion_Statement: {"kind": None},
+    nodes.Iir_Kind.Component_Instantiation_Statement: {"kind": lsp.SymbolKind.Method},
+    nodes.Iir_Kind.Block_Statement: {"kind": lsp.SymbolKind.Method},
+    nodes.Iir_Kind.If_Generate_Statement: {"kind": lsp.SymbolKind.Method},
+    nodes.Iir_Kind.For_Generate_Statement: {"kind": lsp.SymbolKind.Method},
+    nodes.Iir_Kind.Case_Generate_Statement: {"kind": lsp.SymbolKind.Method},
+    nodes.Iir_Kind.Sensitized_Process_Statement: {"kind": lsp.SymbolKind.Method},
+    nodes.Iir_Kind.Process_Statement: {"kind": lsp.SymbolKind.Method},
+    nodes.Iir_Kind.Psl_Assert_Directive: {"kind": lsp.SymbolKind.Method},
+    nodes.Iir_Kind.Psl_Assume_Directive: {"kind": lsp.SymbolKind.Method},
+    nodes.Iir_Kind.Psl_Cover_Directive: {"kind": lsp.SymbolKind.Method},
+    nodes.Iir_Kind.Psl_Restrict_Directive: {"kind": lsp.SymbolKind.Method},
+    nodes.Iir_Kind.Psl_Endpoint_Declaration: {"kind": lsp.SymbolKind.Variable},
+    nodes.Iir_Kind.Psl_Declaration: {"kind": lsp.SymbolKind.Variable},
+    nodes.Iir_Kind.Psl_Assert_Directive: {"kind": lsp.SymbolKind.Method},
+    nodes.Iir_Kind.Configuration_Specification: {"kind": None},
 }
 
 
@@ -72,7 +78,7 @@ def location_to_position(fe, loc):
     assert loc != files_map.No_Location
     line = files_map.Location_File_To_Line(loc, fe)
     off = files_map.Location_File_Line_To_Offset(loc, fe, line)
-    return {'line': line - 1, 'character': off}
+    return {"line": line - 1, "character": off}
 
 
 def get_symbols_chain(fe, n):
@@ -89,11 +95,10 @@ def get_symbols(fe, n):
     m = SYMBOLS_MAP.get(k, None)
     if m is None:
         raise AssertionError("get_symbol: unhandled {}".format(pyutils.kind_image(k)))
-    kind = m['kind']
+    kind = m["kind"]
     if kind is None:
         return None
-    if k in [nodes.Iir_Kind.Procedure_Declaration,
-             nodes.Iir_Kind.Function_Declaration]:
+    if k in [nodes.Iir_Kind.Procedure_Declaration, nodes.Iir_Kind.Function_Declaration]:
         # Discard implicit declarations.
         if nodes.Get_Implicit_Definition(n) < nodes.Iir_Predefined.PNone:
             return None
@@ -101,13 +106,12 @@ def get_symbols(fe, n):
             # Use the body instead.
             # FIXME: but get interface from the spec!
             return None
-    res = {'kind': kind}
-    detail = m.get('detail')
+    res = {"kind": kind}
+    detail = m.get("detail")
     if detail is not None:
-        res['detail'] = detail
+        res["detail"] = detail
     # Get the name
-    if k in [nodes.Iir_Kind.Function_Body,
-             nodes.Iir_Kind.Procedure_Body]:
+    if k in [nodes.Iir_Kind.Function_Body, nodes.Iir_Kind.Procedure_Body]:
         nid = nodes.Get_Identifier(nodes.Get_Subprogram_Specification(n))
     else:
         nid = nodes.Get_Identifier(n)
@@ -116,15 +120,17 @@ def get_symbols(fe, n):
     else:
         name = pyutils.name_image(nid)
     # Get the range.  Use elocations when possible.
-    if k in (nodes.Iir_Kind.Architecture_Body,
-             nodes.Iir_Kind.Entity_Declaration,
-             nodes.Iir_Kind.Package_Declaration,
-             nodes.Iir_Kind.Package_Body,
-             nodes.Iir_Kind.Component_Declaration,
-             nodes.Iir_Kind.Process_Statement,
-             nodes.Iir_Kind.Sensitized_Process_Statement,
-             nodes.Iir_Kind.If_Generate_Statement,
-             nodes.Iir_Kind.For_Generate_Statement):
+    if k in (
+        nodes.Iir_Kind.Architecture_Body,
+        nodes.Iir_Kind.Entity_Declaration,
+        nodes.Iir_Kind.Package_Declaration,
+        nodes.Iir_Kind.Package_Body,
+        nodes.Iir_Kind.Component_Declaration,
+        nodes.Iir_Kind.Process_Statement,
+        nodes.Iir_Kind.Sensitized_Process_Statement,
+        nodes.Iir_Kind.If_Generate_Statement,
+        nodes.Iir_Kind.For_Generate_Statement,
+    ):
         start_loc = elocations.Get_Start_Location(n)
         end_loc = elocations.Get_End_Location(n)
         if end_loc == files_map.No_Location:
@@ -133,30 +139,39 @@ def get_symbols(fe, n):
     else:
         start_loc = nodes.Get_Location(n)
         end_loc = start_loc + name_table.Get_Name_Length(nid)
-    res['range'] = {'start': location_to_position(fe, start_loc),
-                    'end': location_to_position(fe, end_loc)}
+    res["range"] = {
+        "start": location_to_position(fe, start_loc),
+        "end": location_to_position(fe, end_loc),
+    }
 
     # Gather children.
     # FIXME: should we use a list of fields to inspect ?
     children = []
-    #if nodes_meta.Has_Generic_Chain(k):
+    # if nodes_meta.Has_Generic_Chain(k):
     #    children.extend(get_symbols_chain(fe, nodes.Get_Generic_Chain(n)))
-    #if nodes_meta.Has_Port_Chain(k):
+    # if nodes_meta.Has_Port_Chain(k):
     #    children.extend(get_symbols_chain(fe, nodes.Get_Port_Chain(n)))
-    #if nodes_meta.Has_Interface_Declaration_Chain(k):
+    # if nodes_meta.Has_Interface_Declaration_Chain(k):
     #    children.extend(get_symbols_chain(fe, nodes.Get_Interface_Declaration_Chain(n)))
     if k in (nodes.Iir_Kind.Package_Declaration, nodes.Iir_Kind.Package_Body):
         children.extend(get_symbols_chain(fe, nodes.Get_Declaration_Chain(n)))
     if nodes_meta.Has_Concurrent_Statement_Chain(k):
         children.extend(get_symbols_chain(fe, nodes.Get_Concurrent_Statement_Chain(n)))
     if nodes_meta.Has_Generate_Statement_Body(k):
-        children.extend(get_symbols_chain(fe, nodes.Get_Concurrent_Statement_Chain(nodes.Get_Generate_Statement_Body(n))))
+        children.extend(
+            get_symbols_chain(
+                fe,
+                nodes.Get_Concurrent_Statement_Chain(
+                    nodes.Get_Generate_Statement_Body(n)
+                ),
+            )
+        )
 
     if children:
-        res['children'] = children
+        res["children"] = children
     else:
         # Discard anonymous symbols without children.
         if name is None:
             return None
-    res['name'] = name if name is not None else '<anon>'
+    res["name"] = name if name is not None else "<anon>"
     return res