Merge branch 'master' into master

Author: gnikit

.github/FUNDING.yml

@@ -4,7 +4,7 @@ github: gnikit # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [u
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+tidelift: pypi/fortls
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username

.github/workflows/main.yml

@@ -10,13 +10,13 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11-dev"]
       fail-fast: false
     runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64
@@ -25,7 +25,7 @@ jobs:
         run: pip install .[dev]
 
       - name: Unittests
-        run: pytest -v
+        run: pytest --doctest-modules
 
       - name: Lint
         run: black --diff --check --verbose .
@@ -34,18 +34,21 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
+        python-version: ["3.8","3.10"]
+      fail-fast: false
     runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: ${{ matrix.python-version }}
 
       - name: Coverage report
         run: |
           pip install .[dev]
-          pytest --cov=fortls --cov-report=xml
+          pytest --doctest-modules
+        shell: bash
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3

.github/workflows/python-publish.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: "3.x"
 

.gitignore

@@ -15,3 +15,4 @@ fortls/_version.py
 *.log
 
 .coverage
+coverage.xml

.pre-commit-config.yaml

@@ -2,19 +2,19 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.3.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
     -   id: check-yaml
     -   id: check-added-large-files
         args: ['--maxkb=2000']
--   repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.2
+-   repo: https://github.com/PyCQA/flake8
+    rev: 4.0.1
     hooks:
     - id: flake8
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.32.1
+    rev: v2.37.2
     hooks:
     -   id: pyupgrade
 -   repo: https://github.com/pycqa/isort
@@ -23,6 +23,6 @@ repos:
     -   id: isort
         name: isort (python)
 -   repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 22.6.0
     hooks:
     -   id: black

CHANGELOG.md

@@ -2,6 +2,90 @@
 
 ## Unreleased
 
+## 2.14.0
+
+### Added
+
+- Added coverage testing for multiple Python versions
+  ([#168](https://github.com/gnikit/fortls/pull/178))
+
+## 2.13.0
+
+### Added
+
+- Added pre-commit.ci to `fortls`
+  ([#168](https://github.com/gnikit/fortls/issues/168))
+
+### Fixed
+
+- Fixed `intent(in out)` not being parsed correctly
+  ([#160](https://github.com/gnikit/fortls/issues/160))
+
+## 2.12.0
+
+### Fixed
+
+- Fixed issue where `pip` would install without `--user` and fail
+  ([#163](https://github.com/gnikit/fortls/issues/163))
+
+## 2.11.0
+
+### Fixed
+
+- Fixed bug thorowing diagnostic errors if arguments were named `pure`, `elemental`, etc.
+  ([#157](https://github.com/gnikit/fortls/issues/157))
+
+## 2.10.0
+
+### Fixed
+
+- Fixed `workspace/didChangeConfiguration` requests that caused errors in VS Code logs
+  ([#114](https://github.com/gnikit/fortls/issues/114))
+
+## 2.9.0
+
+### Fixed
+
+- Fixed glob pattern resolution for command line arguments
+  ([#142](https://github.com/gnikit/fortls/issues/142))
+
+### Changed
+
+- Changed the default value of the following options when a mix the command line
+  interface and the `json` interface are used. Instead of having the `json` interface
+  default the values to an empty set it now defaults to the values of the
+  command line: `excl_paths`, `source_dirs`, `incl_suffixes`, `excl_suffixes`, `include_dirs`
+  ([#143](https://github.com/gnikit/fortls/issues/143))
+
+## 2.8.0
+
+### Added
+
+- Added support for comments in the `json` configuration files
+  ([#137](https://github.com/gnikit/fortls/issues/137))
+- Added `sitemap.xml` to documentation webpage
+  ([#134](https://github.com/gnikit/fortls/pull/134))
+
+### Fixed
+
+- Fixed bug where error messages did not post correctly
+  ([#135](https://github.com/gnikit/fortls/issues/135))
+
+## 2.7.0
+
+### Added
+
+- Added doctests in the pytest test suite
+  ([#131](https://github.com/gnikit/fortls/issues/131))
+
+### Changed
+
+- Renamed variables to simplify parser
+  ([#133](https://github.com/gnikit/fortls/pull/133))
+- Redesigned parsing functions for short-hand declarations of array dimensions,
+  character length and parsing of kind
+  ([#130](https://github.com/gnikit/fortls/pull/130))
+
 ## 2.6.0
 
 ### Changed

README.md

@@ -172,6 +172,11 @@ If you want to support this project you can do it through
 When [filing bugs](https://github.com/gnikit/fortls/issues/new)
 please provide example code to reproduce the observed issue.
 
+## Security Policy
+
+To report a security vulnerability please follow the instructions in our
+[Security page](https://github.com/gnikit/fortls/security/policy).
+
 ## License
 
 This project is made available under the [MIT License](https://github.com/gnikit/fortls/blob/master/LICENSE).

docs/conf.py

@@ -80,6 +80,7 @@
     "sphinx_design",
     "sphinx_copybutton",
     "myst_parser",
+    "sphinx_sitemap",
 ]
 # For sphinx_design in Markdown
 myst_enable_extensions = ["colon_fence"]
@@ -106,12 +107,19 @@
 html_title = "fortls"
 html_logo = "../assets/logo.svg"
 html_favicon = "../assets/icon.svg"
+html_baseurl = "https://gnikit.github.io/fortls/"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ["_static"]
 
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+html_extra_path = ["html_extra"]
+# Default is {version}{lang}{link}
+sitemap_url_scheme = "{link}"
 
 display_toc = True
 # autodoc_default_flags = ["members"]

docs/html_extra/google3e426562ce42e98f.html

@@ -0,0 +1 @@
+google-site-verification: google3e426562ce42e98f.html

docs/html_extra/robots.txt

@@ -0,0 +1,3 @@
+User-agent: *
+Disallow:
+Sitemap: https://gnikit.github.io/fortls/sitemap.xml

docs/index.rst

@@ -158,7 +158,7 @@ fortls
 
         Features
 
-    .. grid-item-card:: :material-sharp:`settings;5em;sd-text-primary`
+    .. grid-item-card:: :material-outlined:`settings;5em;sd-text-primary`
         :link-type: doc
         :link: options
         :class-body: sd-text-center

docs/options.rst

@@ -18,7 +18,7 @@ Configuration using the command line
 
 .. argparse::
    :module: fortls
-   :func: commandline_args
+   :func: cli
    :prog: fortls
    :nodefault:
 

fortls/__init__.py

@@ -7,7 +7,7 @@
 from multiprocessing import freeze_support
 
 from .helper_functions import only_dirs, resolve_globs
-from .interface import commandline_args
+from .interface import cli
 from .jsonrpc import JSONRPC2Connection, ReadWriter, path_from_uri
 from .langserver import LangServer
 from .parse_fortran import FortranFile
@@ -24,7 +24,7 @@ def error_exit(error_str: str):
 def main():
     #
     freeze_support()
-    args = commandline_args(__name__).parse_args()
+    args = cli(__name__).parse_args()
 
     if args.version:
         print(__version__)

fortls/ftypes.py

@@ -15,6 +15,7 @@ class VarInfo:
     #: keywords associated with this variable e.g. SAVE, DIMENSION, etc.
     keywords: list[str]  #: Keywords associated with variable
     var_names: list[str]  #: Variable names
+    var_kind: str = field(default=None)  #: Kind of variable e.g. ``INTEGER*4`` etc.
 
 
 @dataclass