Skip to content

Commit b97b533

Browse files
krvajalkrvajal
authored
Release/1.1.0 (#48)
* Fixed logicals, type operator, pointer operator and concatenation highlighting. * Fixes pre-preocessor directive highlighting * Fix definition of language * Update tests * Update travis setup
1 parent 9af5983 commit b97b533

20 files changed

+816
-512
lines changed

‎.package.json.un~‎

-2.41 KB
Binary file not shown.

‎.travis.yml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,22 @@
1-
language: generic
1+
language: node_js
22

3+
node_js:
4+
- "7.0"
35
sudo: false
46

57
os:
68
- linux
7-
9+
- osx
810
before_install:
911
- if [ $TRAVIS_OS_NAME == "linux" ]; then
1012
export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
1113
sh -e /etc/init.d/xvfb start;
1214
sleep 3;
1315
fi
14-
16+
1517
install:
16-
- TRAVIS_NODE_VERSION="7";
17-
# Clear out whatever version of NVM Travis has as it is old.
18-
- rm -rf ~/.nvm;
19-
# Grab NVM.
20-
- git clone https://github.com/creationix/nvm.git ~/.nvm;
21-
# Checkout the latest stable tag.
22-
# Note that you can just hardcode a preferred version here.
23-
- (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`);
24-
# Install the desired version of Node
25-
- source ~/.nvm/nvm.sh;
26-
- nvm install $TRAVIS_NODE_VERSION;
18+
- npm install -g vsce
19+
- npm install -g typescript
2720
- npm install
2821
- npm run vscode:prepublish
2922

‎.vscode/launch.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"type": "extensionHost",
1919
"request": "launch",
2020
"runtimeExecutable": "${execPath}",
21-
"args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out/test" ],
21+
"args": ["test/resources/sample.f90","--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out/test" ],
2222
"stopOnEntry": false,
2323
"sourceMaps": true,
2424
"outFiles": [ "${workspaceRoot}/out/test/**/*.js" ],

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@ All notable changes to this extension will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/)
66
and this project adheres to [Semantic Versioning](http://semver.org/).
77

8+
## [1.1.0] - 2018-04-16
9+
10+
### Fixed
11+
12+
* Regression bug in the last release (#44)
13+
14+
### Added
15+
16+
* Improvements on preprocessor directives highlighting
17+
18+
## [0.6.3] - 2018-01-27
19+
820
## [1.0.1] - 2018-03-19
921

1022
### Fixed

‎coverage/coverage-final.json‎

Lines changed: 13 additions & 10 deletions
Large diffs are not rendered by default.

‎coverage/coverage.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎coverage/index.html‎

Lines changed: 37 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,24 @@ <h1>
2020
</h1>
2121
<div class='clearfix'>
2222
<div class='fl pad1y space-right2'>
23-
<span class="strong">15.5% </span>
23+
<span class="strong">9.01% </span>
2424
<span class="quiet">Statements</span>
25-
<span class='fraction'>53/342</span>
25+
<span class='fraction'>43/477</span>
2626
</div>
2727
<div class='fl pad1y space-right2'>
28-
<span class="strong">20.24% </span>
28+
<span class="strong">4.71% </span>
2929
<span class="quiet">Branches</span>
30-
<span class='fraction'>17/84</span>
30+
<span class='fraction'>8/170</span>
3131
</div>
3232
<div class='fl pad1y space-right2'>
33-
<span class="strong">16.67% </span>
33+
<span class="strong">11.63% </span>
3434
<span class="quiet">Functions</span>
35-
<span class='fraction'>5/30</span>
35+
<span class='fraction'>5/43</span>
3636
</div>
3737
<div class='fl pad1y space-right2'>
38-
<span class="strong">15.62% </span>
38+
<span class="strong">9.45% </span>
3939
<span class="quiet">Lines</span>
40-
<span class='fraction'>52/333</span>
40+
<span class='fraction'>43/455</span>
4141
</div>
4242
</div>
4343
</div>
@@ -62,39 +62,52 @@ <h1>
6262
<td class="file low" data-value="src/"><a href="src/index.html">src/</a></td>
6363
<td data-value="0" class="pic low"><div class="chart"><div class="cover-fill" style="width: 0%;"></div><div class="cover-empty" style="width:100%;"></div></div></td>
6464
<td data-value="0" class="pct low">0%</td>
65-
<td data-value="16" class="abs low">0/16</td>
65+
<td data-value="17" class="abs low">0/17</td>
6666
<td data-value="0" class="pct low">0%</td>
6767
<td data-value="2" class="abs low">0/2</td>
6868
<td data-value="0" class="pct low">0%</td>
6969
<td data-value="1" class="abs low">0/1</td>
7070
<td data-value="0" class="pct low">0%</td>
71-
<td data-value="16" class="abs low">0/16</td>
71+
<td data-value="17" class="abs low">0/17</td>
7272
</tr>
7373

7474
<tr>
7575
<td class="file low" data-value="src/features/"><a href="src/features/index.html">src/features/</a></td>
7676
<td data-value="0" class="pic low"><div class="chart"><div class="cover-fill" style="width: 0%;"></div><div class="cover-empty" style="width:100%;"></div></div></td>
7777
<td data-value="0" class="pct low">0%</td>
78-
<td data-value="177" class="abs low">0/177</td>
78+
<td data-value="170" class="abs low">0/170</td>
7979
<td data-value="0" class="pct low">0%</td>
80-
<td data-value="40" class="abs low">0/40</td>
80+
<td data-value="54" class="abs low">0/54</td>
8181
<td data-value="0" class="pct low">0%</td>
82-
<td data-value="19" class="abs low">0/19</td>
82+
<td data-value="21" class="abs low">0/21</td>
8383
<td data-value="0" class="pct low">0%</td>
84-
<td data-value="174" class="abs low">0/174</td>
84+
<td data-value="162" class="abs low">0/162</td>
8585
</tr>
8686

8787
<tr>
8888
<td class="file low" data-value="src/lib/"><a href="src/lib/index.html">src/lib/</a></td>
89-
<td data-value="35.57" class="pic low"><div class="chart"><div class="cover-fill" style="width: 35%;"></div><div class="cover-empty" style="width:65%;"></div></div></td>
90-
<td data-value="35.57" class="pct low">35.57%</td>
91-
<td data-value="149" class="abs low">53/149</td>
92-
<td data-value="40.48" class="pct low">40.48%</td>
93-
<td data-value="42" class="abs low">17/42</td>
94-
<td data-value="50" class="pct medium">50%</td>
95-
<td data-value="10" class="abs medium">5/10</td>
96-
<td data-value="36.36" class="pct low">36.36%</td>
97-
<td data-value="143" class="abs low">52/143</td>
89+
<td data-value="19.55" class="pic low"><div class="chart"><div class="cover-fill" style="width: 19%;"></div><div class="cover-empty" style="width:81%;"></div></div></td>
90+
<td data-value="19.55" class="pct low">19.55%</td>
91+
<td data-value="220" class="abs low">43/220</td>
92+
<td data-value="10.53" class="pct low">10.53%</td>
93+
<td data-value="76" class="abs low">8/76</td>
94+
<td data-value="29.41" class="pct low">29.41%</td>
95+
<td data-value="17" class="abs low">5/17</td>
96+
<td data-value="20.48" class="pct low">20.48%</td>
97+
<td data-value="210" class="abs low">43/210</td>
98+
</tr>
99+
100+
<tr>
101+
<td class="file low" data-value="src/lib/parsers/"><a href="src/lib/parsers/index.html">src/lib/parsers/</a></td>
102+
<td data-value="0" class="pic low"><div class="chart"><div class="cover-fill" style="width: 0%;"></div><div class="cover-empty" style="width:100%;"></div></div></td>
103+
<td data-value="0" class="pct low">0%</td>
104+
<td data-value="70" class="abs low">0/70</td>
105+
<td data-value="0" class="pct low">0%</td>
106+
<td data-value="38" class="abs low">0/38</td>
107+
<td data-value="0" class="pct low">0%</td>
108+
<td data-value="4" class="abs low">0/4</td>
109+
<td data-value="0" class="pct low">0%</td>
110+
<td data-value="66" class="abs low">0/66</td>
98111
</tr>
99112

100113
</tbody>
@@ -103,7 +116,7 @@ <h1>
103116
</div><!-- /wrapper -->
104117
<div class='footer quiet pad2 space-top1 center small'>
105118
Code coverage
106-
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Aug 06 2017 02:54:54 GMT-0300 (-03)
119+
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Apr 15 2018 18:43:07 GMT+0200 (CEST)
107120
</div>
108121
</div>
109122
<script src="prettify.js"></script>

‎coverage/src/extension.ts.html‎

Lines changed: 45 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h1>
2222
<div class='fl pad1y space-right2'>
2323
<span class="strong">0% </span>
2424
<span class="quiet">Statements</span>
25-
<span class='fraction'>0/16</span>
25+
<span class='fraction'>0/17</span>
2626
</div>
2727
<div class='fl pad1y space-right2'>
2828
<span class="strong">0% </span>
@@ -37,7 +37,7 @@ <h1>
3737
<div class='fl pad1y space-right2'>
3838
<span class="strong">0% </span>
3939
<span class="quiet">Lines</span>
40-
<span class='fraction'>0/16</span>
40+
<span class='fraction'>0/17</span>
4141
</div>
4242
</div>
4343
</div>
@@ -67,7 +67,14 @@ <h1>
6767
22
6868
23
6969
24
70-
25</td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
70+
25
71+
26
72+
27
73+
28
74+
29
75+
30
76+
31
77+
32</td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
7178
<span class="cline-any cline-no">&nbsp;</span>
7279
<span class="cline-any cline-neutral">&nbsp;</span>
7380
<span class="cline-any cline-no">&nbsp;</span>
@@ -80,48 +87,62 @@ <h1>
8087
<span class="cline-any cline-no">&nbsp;</span>
8188
<span class="cline-any cline-no">&nbsp;</span>
8289
<span class="cline-any cline-no">&nbsp;</span>
83-
<span class="cline-any cline-neutral">&nbsp;</span>
8490
<span class="cline-any cline-no">&nbsp;</span>
8591
<span class="cline-any cline-neutral">&nbsp;</span>
8692
<span class="cline-any cline-no">&nbsp;</span>
8793
<span class="cline-any cline-no">&nbsp;</span>
8894
<span class="cline-any cline-no">&nbsp;</span>
95+
<span class="cline-any cline-no">&nbsp;</span>
8996
<span class="cline-any cline-neutral">&nbsp;</span>
9097
<span class="cline-any cline-neutral">&nbsp;</span>
9198
<span class="cline-any cline-no">&nbsp;</span>
99+
<span class="cline-any cline-neutral">&nbsp;</span>
100+
<span class="cline-any cline-neutral">&nbsp;</span>
101+
<span class="cline-any cline-neutral">&nbsp;</span>
92102
<span class="cline-any cline-no">&nbsp;</span>
93103
<span class="cline-any cline-no">&nbsp;</span>
104+
<span class="cline-any cline-neutral">&nbsp;</span>
105+
<span class="cline-any cline-neutral">&nbsp;</span>
106+
<span class="cline-any cline-neutral">&nbsp;</span>
107+
<span class="cline-any cline-neutral">&nbsp;</span>
94108
<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">// src/extension.ts
95-
<span class="cstat-no" title="statement not covered" >import * as vscode from 'vscode';</span>
109+
<span class="cstat-no" title="statement not covered" >import * as vscode from "vscode";</span>
96110
&nbsp;
97-
<span class="cstat-no" title="statement not covered" >import FortranLintingProvider from './features/linter-provider';</span>
98-
<span class="cstat-no" title="statement not covered" >import FortranHoverProvider from './features/hover-provider';</span>
99-
<span class="cstat-no" title="statement not covered" >import { FortranCompletionProvider } from './features/completion-provider';</span>
100-
<span class="cstat-no" title="statement not covered" >import { FortranDocumentSymbolProvider } from './features/document-symbol-provider';</span>
111+
<span class="cstat-no" title="statement not covered" >import FortranLintingProvider from "./features/linter-provider";</span>
112+
<span class="cstat-no" title="statement not covered" >import FortranHoverProvider from "./features/hover-provider";</span>
113+
<span class="cstat-no" title="statement not covered" >import { FortranCompletionProvider } from "./features/completion-provider";</span>
114+
<span class="cstat-no" title="statement not covered" >import { FortranDocumentSymbolProvider } from "./features/document-symbol-provider";</span>
101115
&nbsp;
102-
<span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" >export function activate(context: vscode.ExtensionContext)</span> {</span>
103-
&nbsp;
104-
<span class="cstat-no" title="statement not covered" > let hoverProvider = new FortranHoverProvider();</span>
105-
<span class="cstat-no" title="statement not covered" > let completionProvider = new FortranCompletionProvider();</span>
106-
<span class="cstat-no" title="statement not covered" > let symbolProvider = new FortranDocumentSymbolProvider();</span>
116+
<span class="cstat-no" title="statement not covered" >const FORTRAN_FREE_FORM_ID = "fortran_free-form";</span>
107117
&nbsp;
108-
<span class="cstat-no" title="statement not covered" > if (vscode.workspace.getConfiguration('fortran').get('linterEnabled', true)) {</span>
118+
<span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" >export function activate(context: vscode.ExtensionContext)</span> {</span>
119+
<span class="cstat-no" title="statement not covered" > let hoverProvider = new FortranHoverProvider();</span>
120+
<span class="cstat-no" title="statement not covered" > let completionProvider = new FortranCompletionProvider();</span>
121+
<span class="cstat-no" title="statement not covered" > let symbolProvider = new FortranDocumentSymbolProvider();</span>
109122
&nbsp;
110-
<span class="cstat-no" title="statement not covered" > let linter = new FortranLintingProvider();</span>
111-
<span class="cstat-no" title="statement not covered" > linter.activate(context.subscriptions);</span>
112-
<span class="cstat-no" title="statement not covered" > vscode.languages.registerCodeActionsProvider('fortran90', linter);</span>
113-
}
123+
<span class="cstat-no" title="statement not covered" > if (vscode.workspace.getConfiguration("fortran").get("linterEnabled", true)) {</span>
124+
<span class="cstat-no" title="statement not covered" > let linter = new FortranLintingProvider();</span>
125+
<span class="cstat-no" title="statement not covered" > linter.activate(context.subscriptions);</span>
126+
<span class="cstat-no" title="statement not covered" > vscode.languages.registerCodeActionsProvider(FORTRAN_FREE_FORM_ID, linter);</span>
127+
}
114128
&nbsp;
115-
<span class="cstat-no" title="statement not covered" > vscode.languages.registerCompletionItemProvider('fortran90', completionProvider);</span>
116-
<span class="cstat-no" title="statement not covered" > vscode.languages.registerHoverProvider('fortran90', hoverProvider);</span>
117-
<span class="cstat-no" title="statement not covered" > vscode.languages.registerDocumentSymbolProvider('fortran90', symbolProvider);</span>
118-
}</pre></td></tr>
129+
<span class="cstat-no" title="statement not covered" > vscode.languages.registerCompletionItemProvider(</span>
130+
FORTRAN_FREE_FORM_ID,
131+
completionProvider
132+
);
133+
<span class="cstat-no" title="statement not covered" > vscode.languages.registerHoverProvider(FORTRAN_FREE_FORM_ID, hoverProvider);</span>
134+
<span class="cstat-no" title="statement not covered" > vscode.languages.registerDocumentSymbolProvider(</span>
135+
FORTRAN_FREE_FORM_ID,
136+
symbolProvider
137+
);
138+
}
139+
&nbsp;</pre></td></tr>
119140
</table></pre>
120141
<div class='push'></div><!-- for sticky footer -->
121142
</div><!-- /wrapper -->
122143
<div class='footer quiet pad2 space-top1 center small'>
123144
Code coverage
124-
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Aug 06 2017 02:54:54 GMT-0300 (-03)
145+
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Apr 15 2018 18:43:07 GMT+0200 (CEST)
125146
</div>
126147
</div>
127148
<script src="../prettify.js"></script>

0 commit comments

Comments
 (0)