Skip to content

Commit 64b333d

Browse files
authored
Merge branch 'master' into dev
2 parents 5addf6e + 5441942 commit 64b333d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+5062
-2354
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @gnikit
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Try and reproduce the `fortls` error through the debug interface, for more see `fortls --debug_help`. Usually debug requests start like `fortls --debug_filepath your_file.f90 --debug_rootpath . ...`.
15+
16+
Start with posting:
17+
1. a **Minimal Working Example** to demonstrate the bug
18+
2. the `fortls` command to reproduce the issue, or your `fortls`
19+
3. the output of the `fortls` command
20+
4. Any additional JSONRPC requests like the ones produced with `--debug_log`
21+
22+
Alternatively, you can try and describe the steps that you followed to encounter the bug:
23+
1. Go to '...'
24+
2. Click on '....'
25+
3. Scroll down to '....'
26+
4. See error
27+
28+
**Expected behavior**
29+
A clear and concise description of what you expected to happen.
30+
31+
**Screenshots & Animations**
32+
If applicable, add screenshots or GIF/MP4 animations to help explain your problem.
33+
34+
**Setup information (please complete the following information):**
35+
- OS: [e.g. Linux, Mac]
36+
- Python Version [e.g. 3.10]
37+
- fortls Version [e.g. 2.3]
38+
- Code editor used [e.g. VS Code, Vim]
39+
- the Fortran extension for the code editor and its version [e.g. Modern Fortran v3.0.0] (if applicable)
40+
41+
**Configuration information (please complete the following information):**
42+
- Your `.fortls` configuration file OR any other JSON config being used (if any)
43+
- Any settings specified through your extension [e.g. for VS Code settings from `settings.json`]
44+
45+
**Additional context**
46+
Add any other context about the problem here.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: enhancement
6+
assignees: ''
7+
8+
---
9+
10+
<!-- DO NOT DELETE THIS
11+
12+
Before opening a Feature Request make sure to check the "Issues" section
13+
in case someone else has filed a similar request. -->
14+
15+
**Is your feature request related to a problem? Please describe.**
16+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
17+
18+
**Describe the solution you'd like**
19+
A clear and concise description of what you want to happen.
20+
21+
**Describe alternatives you've considered**
22+
A clear and concise description of any alternative solutions or features you've considered.
23+
24+
**Additional context**
25+
Add any other context or screenshots about the feature request here.

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"

.github/workflows/codeql-analysis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ dev ]
16+
branches: [ master, dev ]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ dev ]
19+
branches: [ master, dev ]
2020
schedule:
2121
- cron: '24 7 * * 2'
2222

@@ -38,11 +38,11 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@v2
41+
uses: actions/checkout@v3
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v1
45+
uses: github/codeql-action/init@v2
4646
with:
4747
languages: ${{ matrix.language }}
4848
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
5353
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5454
# If this step fails, then you should remove it and run the build manually (see below)
5555
- name: Autobuild
56-
uses: github/codeql-action/autobuild@v1
56+
uses: github/codeql-action/autobuild@v2
5757

5858
# ℹ️ Command-line programs to run using the OS shell.
5959
# 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
6767
# make release
6868

6969
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@v1
70+
uses: github/codeql-action/analyze@v2

.github/workflows/docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
name: "Documentation"
1+
name: "Docs"
22
on: [push, pull_request]
33

44
jobs:
55
docs:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v2
8+
- uses: actions/checkout@v3
99
- uses: sphinx-toolbox/sphinx-action@master
1010
with:
1111
pre-build-command: "pip install .[docs]"
1212
docs-folder: "docs/"
1313
- name: Deploy
1414
uses: peaceiris/actions-gh-pages@v3
15-
if: github.ref == 'refs/heads/dev'
15+
if: github.ref == 'refs/heads/master'
1616
with:
1717
github_token: ${{ secrets.GITHUB_TOKEN }}
1818
publish_dir: docs/_build/html

.github/workflows/main.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
runs-on: ${{ matrix.os }}
1616

1717
steps:
18-
- uses: actions/checkout@v2
19-
- uses: actions/setup-python@v2
18+
- uses: actions/checkout@v3
19+
- uses: actions/setup-python@v3
2020
with:
2121
python-version: ${{ matrix.python-version }}
2222
architecture: x64
@@ -31,11 +31,14 @@ jobs:
3131
run: black --diff --check --verbose .
3232

3333
coverage:
34-
runs-on: ubuntu-latest
34+
strategy:
35+
matrix:
36+
os: [ubuntu-latest, windows-latest]
37+
runs-on: ${{ matrix.os }}
3538

3639
steps:
37-
- uses: actions/checkout@v2
38-
- uses: actions/setup-python@v2
40+
- uses: actions/checkout@v3
41+
- uses: actions/setup-python@v3
3942
with:
4043
python-version: "3.10"
4144

@@ -45,7 +48,7 @@ jobs:
4548
pytest --cov=fortls --cov-report=xml
4649
4750
- name: Upload coverage to Codecov
48-
uses: codecov/codecov-action@v2
51+
uses: codecov/codecov-action@v3
4952
with:
5053
token: ${{ secrets.CODECOV_TOKEN }}
5154
fail_ci_if_error: true

.github/workflows/python-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
2121
- name: Set up Python
22-
uses: actions/setup-python@v2
22+
uses: actions/setup-python@v3
2323
with:
2424
python-version: "3.x"
2525

CHANGELOG.md

Lines changed: 155 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,158 @@
1-
# CHANGELONG
1+
# CHANGELOG
2+
3+
## Unreleased
4+
5+
## 2.4.0
6+
7+
### Added
8+
9+
- Added Code of Conduct
10+
11+
## 2.3.1
12+
13+
### Fixed
14+
15+
- Fixed remote coverage report line diff
16+
([#101](https://github.com/gnikit/fortls/issues/101))
17+
18+
## 2.3.0
19+
20+
### Added
21+
22+
- Added keywords to the PyPi manifest
23+
([#99](https://github.com/gnikit/fortls/issues/99))
24+
25+
### Changed
26+
27+
- Updated `README` to include logo and animations
28+
- Updated `README` to include conda-forge installation instructions
29+
30+
## 2.2.14
31+
32+
### Added
33+
34+
- Added unittests for intrinsics and improved overall coverage
35+
36+
### Changed
37+
38+
- Restructured unittests to individual files for more granular reporting
39+
40+
## 2.2.13
41+
42+
### Added
43+
44+
- Automated the update for GitHub Actions
45+
46+
## 2.2.12
47+
48+
### Added
49+
50+
- Added coverage reporting for Unix + Windows
51+
52+
## 2.2.11
53+
54+
### Added
55+
56+
- Improved autocompletion for Fortran statements F2018 compliant
57+
([#63](https://github.com/gnikit/fortls/issues/63))
58+
59+
## 2.2.10
60+
61+
### Fixed
62+
63+
- Fixes GoTo Implementation error for intrinsics
64+
([#80](https://github.com/gnikit/fortls/issues/80))
65+
66+
## 2.2.9
67+
68+
### Changed
69+
70+
- Changed how renaming of implicitly named type-bound procedures and their
71+
implementations is handled. Unittest was added.
72+
- Rewrote the Fortran parser to be clearer and more modular
73+
74+
## 2.2.8
75+
76+
### Changed
77+
78+
- Disable PyPi autoupdating for pre-releases and dev versions
79+
80+
## 2.2.7
81+
82+
### Changed
83+
84+
- Changed the auto-update feature to skip `anaconda` environments since they
85+
handle their dependencies through `conda` and not `pip`
86+
87+
### Fixed
88+
89+
- Fixed missing dependency from `setup.cfg`
90+
([#78](https://github.com/gnikit/fortls/issues/78))
91+
- Updated configuration file variables in documentation
92+
93+
## 2.2.6
94+
95+
### Added
96+
97+
- Added the capability for `fortls` to auto-update use `--disable_autoupdate` to disable
98+
([#76](https://github.com/gnikit/fortls/issues/76))
99+
100+
## Deprecated
101+
102+
- Deprecated `--variable_hover` option and now is always enabled
103+
([#46](https://github.com/gnikit/fortls/issues/46))
104+
105+
## 2.2.5
106+
107+
### Changed
108+
109+
- Updated `setup.cfg` in preparation of submitting package to `conda-forge`
110+
- Added `Editor Integration` section in documentation
111+
112+
### Fixed
113+
114+
- Fixed parsing of `defined` without by parenthesis surrounding the definition
115+
([#67](https://github.com/gnikit/fortls/pull/67))
116+
117+
## 2.2.4
118+
119+
### Fixed
120+
121+
- Fixed hovering value of literal and constant strings not displaying
122+
([#54](https://github.com/gnikit/fortls/issues/54))
123+
- Fixed hovering string length size is now matching the string
124+
([#55](https://github.com/gnikit/fortls/issues/55))
125+
- Fixed space separated keywords not being displayed upon hover
126+
([#60](https://github.com/gnikit/fortls/issues/60))
127+
128+
## 2.2.3
129+
130+
### Changed
131+
132+
- Changed reading in `json` files to be encoded as UTF-8
133+
([#51](https://github.com/gnikit/fortls/pull/51))
134+
135+
## 2.2.2
136+
137+
### Changed
138+
139+
- Changed the way function hover messages are displayed, now signatures are standardised
140+
([gnikit/fortls#47](https://github.com/gnikit/fortls/issues/47))
141+
142+
### Fixed
143+
144+
- Fixed hovering over functions displaying as theire result types
145+
([gnikit/fortls#22](https://github.com/gnikit/fortls/issues/22))
146+
- Fixed function modifiers not displaying upon hover
147+
([gnikit/fortls#48](https://github.com/gnikit/fortls/issues/48))
148+
- Fixed function hover when returning arrays
149+
([gnikit/fortls#50](https://github.com/gnikit/fortls/issues/50))
150+
151+
## 2.2.1
152+
153+
### Changed
154+
155+
- Changed default branch to master and updated Actions workflows
2156

3157
## 2.2.0
4158

0 commit comments

Comments
 (0)