Skip to content

Commit 40b2105

Browse files
authored
Merge pull request #378 from fortran-lang/docs/minor-edits
docs/minor edits
2 parents de67ae5 + f4f22f3 commit 40b2105

File tree

4 files changed

+275
-36
lines changed

4 files changed

+275
-36
lines changed

README.md

+14-14
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,6 @@ and [Emacs](https://fortls.fortran-lang.org/editor_integration.html#emacs).
6565

6666
- Signature help and hover does not handle elegantly overloaded functions i.e. interfaces
6767

68-
## `fortls` vs `fortran-language-server`
69-
70-
This project was originally based on `fortran-language-server` LSP implementation, but the two projects have since diverged.
71-
72-
`fortls` (this project) is now developed independently of the upstream `hansec/fortran-language-server` project and contains numerous new features and bug fixes
73-
the original `fortran-language-server` does not.
74-
75-
For a complete and detailed list of the differences between the two Language Servers
76-
see the Documentation section: [Unique fortls features (not in fortran-language-server)](https://fortls.fortran-lang.org/fortls_changes.html)
77-
78-
The name of executable for this project has been chosen to remain `fortls`
79-
to allow for integration with pre-existing plugins and workflows, but it could
80-
change in the future.
81-
8268
## Future plans
8369

8470
`fortls` has reached a point where it is feature complete and stable enough to be used in many modern Fortran projects without any issues.
@@ -176,6 +162,20 @@ An example for a Configuration file is given below
176162
| `textDocument/didChange` | Document synchronisation upon changes to the document |
177163
| `textDocument/codeAction` | **Experimental** Generate code |
178164

165+
## `fortls` vs `fortran-language-server`
166+
167+
This project was originally based on `fortran-language-server` LSP implementation, but the two projects have since diverged.
168+
169+
`fortls` (this project) is now developed independently of the upstream `hansec/fortran-language-server` project and contains numerous new features and bug fixes
170+
the original `fortran-language-server` does not.
171+
172+
For a complete and detailed list of the differences between the two Language Servers
173+
see the Documentation section: [Unique fortls features (not in fortran-language-server)](https://fortls.fortran-lang.org/fortls_changes.html)
174+
175+
The name of executable for this project has been chosen to remain `fortls`
176+
to allow for integration with pre-existing plugins and workflows, but it could
177+
change in the future.
178+
179179
## Acknowledgements
180180

181181
This project would not have been possible without the original work of [@hansec](https://github.com/hansec/)

docs/fortls.parsers.internal.rst

+221
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,221 @@
1+
fortls.parsers.internal package
2+
===============================
3+
4+
Submodules
5+
----------
6+
7+
fortls.parsers.internal.associate module
8+
----------------------------------------
9+
10+
.. automodule:: fortls.parsers.internal.associate
11+
:members:
12+
:undoc-members:
13+
:show-inheritance:
14+
15+
fortls.parsers.internal.ast module
16+
----------------------------------
17+
18+
.. automodule:: fortls.parsers.internal.ast
19+
:members:
20+
:undoc-members:
21+
:show-inheritance:
22+
23+
fortls.parsers.internal.base module
24+
-----------------------------------
25+
26+
.. automodule:: fortls.parsers.internal.base
27+
:members:
28+
:undoc-members:
29+
:show-inheritance:
30+
31+
fortls.parsers.internal.block module
32+
------------------------------------
33+
34+
.. automodule:: fortls.parsers.internal.block
35+
:members:
36+
:undoc-members:
37+
:show-inheritance:
38+
39+
fortls.parsers.internal.diagnostics module
40+
------------------------------------------
41+
42+
.. automodule:: fortls.parsers.internal.diagnostics
43+
:members:
44+
:undoc-members:
45+
:show-inheritance:
46+
47+
fortls.parsers.internal.do module
48+
---------------------------------
49+
50+
.. automodule:: fortls.parsers.internal.do
51+
:members:
52+
:undoc-members:
53+
:show-inheritance:
54+
55+
fortls.parsers.internal.enum module
56+
-----------------------------------
57+
58+
.. automodule:: fortls.parsers.internal.enum
59+
:members:
60+
:undoc-members:
61+
:show-inheritance:
62+
63+
fortls.parsers.internal.function module
64+
---------------------------------------
65+
66+
.. automodule:: fortls.parsers.internal.function
67+
:members:
68+
:undoc-members:
69+
:show-inheritance:
70+
71+
fortls.parsers.internal.if\_block module
72+
----------------------------------------
73+
74+
.. automodule:: fortls.parsers.internal.if_block
75+
:members:
76+
:undoc-members:
77+
:show-inheritance:
78+
79+
fortls.parsers.internal.imports module
80+
--------------------------------------
81+
82+
.. automodule:: fortls.parsers.internal.imports
83+
:members:
84+
:undoc-members:
85+
:show-inheritance:
86+
87+
fortls.parsers.internal.include module
88+
--------------------------------------
89+
90+
.. automodule:: fortls.parsers.internal.include
91+
:members:
92+
:undoc-members:
93+
:show-inheritance:
94+
95+
fortls.parsers.internal.interface module
96+
----------------------------------------
97+
98+
.. automodule:: fortls.parsers.internal.interface
99+
:members:
100+
:undoc-members:
101+
:show-inheritance:
102+
103+
fortls.parsers.internal.intrinsics module
104+
-----------------------------------------
105+
106+
.. automodule:: fortls.parsers.internal.intrinsics
107+
:members:
108+
:undoc-members:
109+
:show-inheritance:
110+
111+
fortls.parsers.internal.method module
112+
-------------------------------------
113+
114+
.. automodule:: fortls.parsers.internal.method
115+
:members:
116+
:undoc-members:
117+
:show-inheritance:
118+
119+
fortls.parsers.internal.module module
120+
-------------------------------------
121+
122+
.. automodule:: fortls.parsers.internal.module
123+
:members:
124+
:undoc-members:
125+
:show-inheritance:
126+
127+
fortls.parsers.internal.parser module
128+
-------------------------------------
129+
130+
.. automodule:: fortls.parsers.internal.parser
131+
:members:
132+
:undoc-members:
133+
:show-inheritance:
134+
135+
fortls.parsers.internal.program module
136+
--------------------------------------
137+
138+
.. automodule:: fortls.parsers.internal.program
139+
:members:
140+
:undoc-members:
141+
:show-inheritance:
142+
143+
fortls.parsers.internal.scope module
144+
------------------------------------
145+
146+
.. automodule:: fortls.parsers.internal.scope
147+
:members:
148+
:undoc-members:
149+
:show-inheritance:
150+
151+
fortls.parsers.internal.select module
152+
-------------------------------------
153+
154+
.. automodule:: fortls.parsers.internal.select
155+
:members:
156+
:undoc-members:
157+
:show-inheritance:
158+
159+
fortls.parsers.internal.submodule module
160+
----------------------------------------
161+
162+
.. automodule:: fortls.parsers.internal.submodule
163+
:members:
164+
:undoc-members:
165+
:show-inheritance:
166+
167+
fortls.parsers.internal.subroutine module
168+
-----------------------------------------
169+
170+
.. automodule:: fortls.parsers.internal.subroutine
171+
:members:
172+
:undoc-members:
173+
:show-inheritance:
174+
175+
fortls.parsers.internal.type module
176+
-----------------------------------
177+
178+
.. automodule:: fortls.parsers.internal.type
179+
:members:
180+
:undoc-members:
181+
:show-inheritance:
182+
183+
fortls.parsers.internal.use module
184+
----------------------------------
185+
186+
.. automodule:: fortls.parsers.internal.use
187+
:members:
188+
:undoc-members:
189+
:show-inheritance:
190+
191+
fortls.parsers.internal.utilities module
192+
----------------------------------------
193+
194+
.. automodule:: fortls.parsers.internal.utilities
195+
:members:
196+
:undoc-members:
197+
:show-inheritance:
198+
199+
fortls.parsers.internal.variable module
200+
---------------------------------------
201+
202+
.. automodule:: fortls.parsers.internal.variable
203+
:members:
204+
:undoc-members:
205+
:show-inheritance:
206+
207+
fortls.parsers.internal.where module
208+
------------------------------------
209+
210+
.. automodule:: fortls.parsers.internal.where
211+
:members:
212+
:undoc-members:
213+
:show-inheritance:
214+
215+
Module contents
216+
---------------
217+
218+
.. automodule:: fortls.parsers.internal
219+
:members:
220+
:undoc-members:
221+
:show-inheritance:

docs/fortls.parsers.rst

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
fortls.parsers package
2+
======================
3+
4+
Subpackages
5+
-----------
6+
7+
.. toctree::
8+
:maxdepth: 4
9+
10+
fortls.parsers.internal
11+
12+
Module contents
13+
---------------
14+
15+
.. automodule:: fortls.parsers
16+
:members:
17+
:undoc-members:
18+
:show-inheritance:

docs/fortls.rst

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
fortls package
22
==============
33

4+
Subpackages
5+
-----------
6+
7+
.. toctree::
8+
:maxdepth: 4
9+
10+
fortls.parsers
11+
412
Submodules
513
----------
614

@@ -12,6 +20,14 @@ fortls.constants module
1220
:undoc-members:
1321
:show-inheritance:
1422

23+
fortls.debug module
24+
-------------------
25+
26+
.. automodule:: fortls.debug
27+
:members:
28+
:undoc-members:
29+
:show-inheritance:
30+
1531
fortls.ftypes module
1632
--------------------
1733

@@ -36,14 +52,6 @@ fortls.interface module
3652
:undoc-members:
3753
:show-inheritance:
3854

39-
fortls.intrinsics module
40-
------------------------
41-
42-
.. automodule:: fortls.intrinsics
43-
:members:
44-
:undoc-members:
45-
:show-inheritance:
46-
4755
fortls.json\_templates module
4856
-----------------------------
4957

@@ -68,26 +76,18 @@ fortls.langserver module
6876
:undoc-members:
6977
:show-inheritance:
7078

71-
fortls.objects module
72-
---------------------
73-
74-
.. automodule:: fortls.objects
75-
:members:
76-
:undoc-members:
77-
:show-inheritance:
78-
79-
fortls.parse\_fortran module
80-
----------------------------
79+
fortls.regex\_patterns module
80+
-----------------------------
8181

82-
.. automodule:: fortls.parse_fortran
82+
.. automodule:: fortls.regex_patterns
8383
:members:
8484
:undoc-members:
8585
:show-inheritance:
8686

87-
fortls.regex\_patterns module
88-
-----------------------------
87+
fortls.schema module
88+
--------------------
8989

90-
.. automodule:: fortls.regex_patterns
90+
.. automodule:: fortls.schema
9191
:members:
9292
:undoc-members:
9393
:show-inheritance:

0 commit comments

Comments
 (0)