Skip to content

Commit

Permalink
refactor(parser): move all remaining AST nodes
Browse files Browse the repository at this point in the history
This had to happen in a single commit to ensure that circular
dependencies were correclty resolved.

## TODO:
- Increase converage
- Fix poor quality code Issues
- Simpligy certain parts of the AST nodes
  • Loading branch information
gnikit committed Oct 23, 2023
1 parent c7f644b commit df980ca
Show file tree
Hide file tree
Showing 36 changed files with 2,427 additions and 2,192 deletions.
4 changes: 3 additions & 1 deletion fortls/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import json
import os
import pprint
Expand All @@ -8,7 +10,7 @@
from .interface import cli
from .jsonrpc import JSONRPC2Connection, ReadWriter, path_from_uri
from .langserver import LangServer
from .parse_fortran import FortranFile
from .parsers.internal.parser import FortranFile
from .version import __version__

__all__ = ["__version__"]
Expand Down
20 changes: 10 additions & 10 deletions fortls/langserver.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,26 +41,26 @@
resolve_globs,
set_keyword_ordering,
)
from fortls.intrinsics import (
from fortls.json_templates import change_json, symbol_json, uri_json
from fortls.jsonrpc import JSONRPC2Connection, path_from_uri, path_to_uri
from fortls.parsers.internal.ast import FortranAST
from fortls.parsers.internal.imports import Import
from fortls.parsers.internal.intrinsics import (
Intrinsic,
get_intrinsic_keywords,
load_intrinsics,
set_lowercase_intrinsics,
)
from fortls.json_templates import change_json, symbol_json, uri_json
from fortls.jsonrpc import JSONRPC2Connection, path_from_uri, path_to_uri
from fortls.objects import (
FortranAST,
Import,
Scope,
Use,
Variable,
from fortls.parsers.internal.parser import FortranFile, get_line_context
from fortls.parsers.internal.scope import Scope
from fortls.parsers.internal.use import Use
from fortls.parsers.internal.utilities import (
climb_type_tree,
find_in_scope,
find_in_workspace,
get_use_tree,
)
from fortls.parse_fortran import FortranFile, get_line_context
from fortls.parsers.internal.variable import Variable
from fortls.regex_patterns import create_src_file_exts_str
from fortls.version import __version__

Expand Down
Loading

0 comments on commit df980ca

Please sign in to comment.