Further removal of fstrings

Author: gnikit

fortls/__init__.py

@@ -14,8 +14,8 @@
 from .interface import commandline_args
 
 
-def error_exit(error_str):
-    print("ERROR: {0}".format(error_str))
+def error_exit(error_str: str):
+    print(f"ERROR: {error_str}")
     sys.exit(-1)
 
 
@@ -25,7 +25,7 @@ def main():
     args = commandline_args(__name__).parse_args()
 
     if args.version:
-        print("{0}".format(__version__))
+        print(__version__)
         sys.exit(0)
 
     debug_server = (

fortls/langserver.py

@@ -877,7 +877,7 @@ def get_all_references(self, def_obj, type_mem, file_obj=None):
         # Search through all files
         def_name = def_obj.name.lower()
         def_fqsn = def_obj.FQSN
-        NAME_REGEX = re.compile(r"(?:\W|^)({0})(?:\W|$)".format(def_name), re.I)
+        NAME_REGEX = re.compile(fr"(?:\W|^)({def_name})(?:\W|$)", re.I)
         if file_obj is None:
             file_set = self.workspace.items()
         else:
@@ -1142,12 +1142,12 @@ def serve_rename(self, request):
                 full_line = curr_line + "".join(post_lines)
                 if full_line.find("=>") < 0:
                     bind_obj = def_obj
-                    bind_change = "{0} => {1}".format(new_name, def_obj.name)
+                    bind_change = f"{new_name} => {def_obj.name}"
         elif (len(ref_objs) > 0) and (
             ref_objs[0].get_type(no_link=True) == METH_TYPE_ID
         ):
             bind_obj = ref_objs[0]
-            bind_change = "{0} => {1}".format(ref_objs[0].name, new_name)
+            bind_change = f"{ref_objs[0].name} => {new_name}"
         # Replace definition statement with explicit implementation naming
         if bind_obj is not None:
             def_uri = path_to_uri(bind_obj.file_ast.file.path)
@@ -1395,7 +1395,7 @@ def serve_exit(self, request):
     def serve_default(self, request):
         # Default handler (errors!)
         raise JSONRPC2Error(
-            code=-32601, message="method {} not found".format(request["method"])
+            code=-32601, message=f"method {request['method']} not found"
         )
 
     def _load_config_file(self) -> bool | None:

fortls/objects.py

@@ -697,9 +697,7 @@ def check_use(self, obj_tree):
             if use_stmnt.mod_name not in obj_tree:
                 new_diag = fortran_diagnostic(
                     use_stmnt.line_number - 1,
-                    message='Module "{0}" not found in project'.format(
-                        use_stmnt.mod_name
-                    ),
+                    message=f'Module "{use_stmnt.mod_name}" not found in project',
                     severity=3,
                     find_word=use_stmnt.mod_name,
                 )
@@ -924,7 +922,7 @@ def resolve_arg_link(self, obj_tree):
             else:
                 self.arg_objs[ind] = child
                 if child.is_optional():
-                    arg_list[ind] = "{0}={0}".format(arg_list[ind])
+                    arg_list[ind] = f"{arg_list[ind]}={arg_list[ind]}"
         self.args_snip = ",".join(arg_list)
 
     def resolve_link(self, obj_tree):
@@ -990,7 +988,7 @@ def get_signature(self, drop_arg=-1):
                 arg_sigs.append({"label": arg_list[i]})
             else:
                 if arg_obj.is_optional():
-                    label = "{0}={0}".format(arg_obj.name.lower())
+                    label = f"{arg_obj.name.lower()}={arg_obj.name.lower()}"
                 else:
                     label = arg_obj.name.lower()
                 arg_sigs.append(
@@ -1025,7 +1023,7 @@ def get_interface(self, name_replace=None, change_arg=-1, change_strings=None):
         name = self.name
         if name_replace is not None:
             name = name_replace
-        interface_array.append("END SUBROUTINE {0}".format(name))
+        interface_array.append(f"END SUBROUTINE {name}")
         return "\n".join(interface_array)
 
     def check_valid_parent(self):
@@ -1040,9 +1038,8 @@ def get_diagnostics(self):
         for missing_obj in self.missing_args:
             new_diag = fortran_diagnostic(
                 missing_obj.sline - 1,
-                'Variable "{0}" with INTENT keyword not found in argument list'.format(
-                    missing_obj.name
-                ),
+                f'Variable "{missing_obj.name}" with INTENT keyword not found in'
+                " argument list",
                 severity=1,
                 find_word=missing_obj.name,
             )
@@ -1056,7 +1053,7 @@ def get_diagnostics(self):
                 arg_name = arg_list[i].strip()
                 new_diag = fortran_diagnostic(
                     self.sline - 1,
-                    'No matching declaration found for argument "{0}"'.format(arg_name),
+                    f'No matching declaration found for argument "{arg_name}"',
                     severity=1,
                     find_word=arg_name,
                 )
@@ -1139,19 +1136,19 @@ def get_interface(self, name_replace=None, change_arg=-1, change_strings=None):
         if self.return_type is not None:
             keyword_list.append(self.return_type)
         if self.result_obj is not None:
-            fun_sig += " RESULT({0})".format(self.result_obj.name)
+            fun_sig += f" RESULT({self.result_obj.name})"
         keyword_list += get_keywords(self.keywords)
         keyword_list.append("FUNCTION ")
         interface_array = self.get_interface_array(
             keyword_list, fun_sig, change_arg, change_strings
         )
         if self.result_obj is not None:
             arg_doc, _ = self.result_obj.get_hover(include_doc=False)
-            interface_array.append("{0} :: {1}".format(arg_doc, self.result_obj.name))
+            interface_array.append(f"{arg_doc} :: {self.result_obj.name}")
         name = self.name
         if name_replace is not None:
             name = name_replace
-        interface_array.append("END FUNCTION {0}".format(name))
+        interface_array.append(f"END FUNCTION {name}")
         return "\n".join(interface_array)
 
 
@@ -1239,7 +1236,7 @@ def get_diagnostics(self):
             ):
                 new_diag = fortran_diagnostic(
                     self.eline - 1,
-                    'Deferred procedure "{0}" not implemented'.format(in_child.name),
+                    f'Deferred procedure "{in_child.name}" not implemented',
                     severity=1,
                 )
                 new_diag.add_related(
@@ -1276,8 +1273,8 @@ def get_actions(self, sline, eline):
                 interface_string = in_child.get_interface(
                     name_replace=in_child.name,
                     change_strings=(
-                        "class({0})".format(in_child.parent.name),
-                        "CLASS({0})".format(self.name),
+                        f"class({in_child.parent.name})",
+                        f"CLASS({self.name})",
                     ),
                 )
                 if interface_string is None:
@@ -1299,7 +1296,7 @@ def get_actions(self, sline, eline):
                 edits += interface_edits
                 new_diag = fortran_diagnostic(
                     line_number,
-                    'Deferred procedure "{0}" not implemented'.format(in_child.name),
+                    f'Deferred procedure "{in_child.name}" not implemented',
                     severity=1,
                 )
                 new_diag.add_related(
@@ -1690,18 +1687,16 @@ def check_definition(self, obj_tree, known_types={}, interface=False):
                     if interface:
                         out_diag = fortran_diagnostic(
                             self.sline - 1,
-                            message='Object "{0}" not imported in interface'.format(
-                                desc_obj_name
+                            message=(
+                                f'Object "{desc_obj_name}" not imported in interface'
                             ),
                             severity=1,
                             find_word=desc_obj_name,
                         )
                     else:
                         out_diag = fortran_diagnostic(
                             self.sline - 1,
-                            message='Object "{0}" not found in scope'.format(
-                                desc_obj_name
-                            ),
+                            message=f'Object "{desc_obj_name}" not found in scope',
                             severity=1,
                             find_word=desc_obj_name,
                         )
@@ -1771,9 +1766,9 @@ def get_hover(self, long=False, include_doc=True, drop_arg=-1):
         if long:
             if self.link_obj is None:
                 sub_sig, _ = self.get_snippet()
-                hover_str = "{0} {1}".format(self.get_desc(), sub_sig)
+                hover_str = f"{self.get_desc()} {sub_sig}"
                 if include_doc and (doc_str is not None):
-                    hover_str += "\n{0}".format(doc_str)
+                    hover_str += f"\n{doc_str}"
             else:
                 link_hover, _ = self.link_obj.get_hover(
                     long=True, include_doc=include_doc, drop_arg=self.drop_arg
@@ -1803,7 +1798,7 @@ def get_hover(self, long=False, include_doc=True, drop_arg=-1):
         else:
             hover_str = ", ".join([self.desc] + get_keywords(self.keywords))
             if include_doc and (doc_str is not None):
-                hover_str += "\n{0}".format(doc_str)
+                hover_str += f"\n{doc_str}"
             return hover_str, True
 
     def get_signature(self, drop_arg=-1):
@@ -2119,7 +2114,7 @@ def check_file(self, obj_tree):
             )
         for error in self.end_errors:
             if error[0] >= 0:
-                message = "Unexpected end of scope at line {0}".format(error[0])
+                message = f"Unexpected end of scope at line {error[0]}"
             else:
                 message = "Unexpected end statement: No open scopes"
             errors.append(fortran_diagnostic(error[1] - 1, message=message, severity=1))
@@ -2128,9 +2123,7 @@ def check_file(self, obj_tree):
                 errors.append(
                     fortran_diagnostic(
                         scope.sline - 1,
-                        message='Invalid parent for "{0}" declaration'.format(
-                            scope.get_desc()
-                        ),
+                        message=f'Invalid parent for "{scope.get_desc()}" declaration',
                         severity=1,
                     )
                 )

fortls/parse_fortran.py

@@ -1120,14 +1120,12 @@ def preprocess(
     def check_file(self, obj_tree, max_line_length=-1, max_comment_line_length=-1):
         diagnostics = []
         if (max_line_length > 0) or (max_comment_line_length > 0):
-            line_message = 'Line length exceeds "max_line_length" ({0})'.format(
-                max_line_length
-            )
+            line_message = f'Line length exceeds "max_line_length" ({max_line_length})'
             comment_message = (
-                'Comment line length exceeds "max_comment_line_length" ({0})'.format(
-                    max_comment_line_length
-                )
+                'Comment line length exceeds "max_comment_line_length"'
+                f" ({max_comment_line_length})"
             )
+
             if self.fixed:
                 COMMENT_LINE_MATCH = FIXED_COMMENT_LINE_MATCH
             else:
@@ -1383,7 +1381,7 @@ def replace_vars(line: str):
         for def_tmp, value in defs_tmp.items():
             def_regex = def_regexes.get(def_tmp)
             if def_regex is None:
-                def_regex = re.compile(r"\b{0}\b".format(def_tmp))
+                def_regex = re.compile(fr"\b{def_tmp}\b")
                 def_regexes[def_tmp] = def_regex
             line_new, nsubs = def_regex.subn(value, line)
             if nsubs > 0: