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
fortran-lang · Apr 16, 2018 · b97b533 · b97b533
1 parent 9af5983
commit b97b533
Show file tree

Hide file tree

Showing 20 changed files with 816 additions and 512 deletions.
diff --git a/.package.json.un~ b/.package.json.un~
diff --git a/.travis.yml b/.travis.yml
@@ -1,29 +1,22 @@
-language: generic
+language: node_js
 
+node_js:
+  - "7.0"
 sudo: false
 
 os:
   - linux
-
+  - osx
 before_install:
   - if [ $TRAVIS_OS_NAME == "linux" ]; then
       export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
       sh -e /etc/init.d/xvfb start;
       sleep 3;
     fi
-
+    
 install:
-  - TRAVIS_NODE_VERSION="7";
-      # Clear out whatever version of NVM Travis has as it is old.
-  - rm -rf ~/.nvm;
-      # Grab NVM.
-  - git clone https://github.com/creationix/nvm.git ~/.nvm;
-      # Checkout the latest stable tag.
-      # Note that you can just hardcode a preferred version here.
-  - (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`);
-      # Install the desired version of Node
-  - source ~/.nvm/nvm.sh;
-  - nvm install $TRAVIS_NODE_VERSION;
+  - npm install -g vsce
+  - npm install -g typescript
   - npm install
   - npm run vscode:prepublish
 

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -18,7 +18,7 @@
             "type": "extensionHost",
             "request": "launch",
             "runtimeExecutable": "${execPath}",
-            "args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out/test" ],
+            "args": ["test/resources/sample.f90","--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out/test" ],
             "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": [ "${workspaceRoot}/out/test/**/*.js" ],

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,18 @@ All notable changes to this extension will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.1.0] - 2018-04-16
+
+### Fixed
+
+* Regression bug in the last release (#44)
+
+### Added
+
+* Improvements on preprocessor directives highlighting
+
+## [0.6.3] - 2018-01-27
+
 ## [1.0.1] - 2018-03-19
 
 ### Fixed

diff --git a/coverage/coverage-final.json b/coverage/coverage-final.json
diff --git a/coverage/coverage.json b/coverage/coverage.json
diff --git a/coverage/index.html b/coverage/index.html
@@ -20,24 +20,24 @@ <h1>
     </h1>
     <div class='clearfix'>
       <div class='fl pad1y space-right2'>
-        <span class="strong">15.5% </span>
+        <span class="strong">9.01% </span>
         <span class="quiet">Statements</span>
-        <span class='fraction'>53/342</span>
+        <span class='fraction'>43/477</span>
       </div>
       <div class='fl pad1y space-right2'>
-        <span class="strong">20.24% </span>
+        <span class="strong">4.71% </span>
         <span class="quiet">Branches</span>
-        <span class='fraction'>17/84</span>
+        <span class='fraction'>8/170</span>
       </div>
       <div class='fl pad1y space-right2'>
-        <span class="strong">16.67% </span>
+        <span class="strong">11.63% </span>
         <span class="quiet">Functions</span>
-        <span class='fraction'>5/30</span>
+        <span class='fraction'>5/43</span>
       </div>
       <div class='fl pad1y space-right2'>
-        <span class="strong">15.62% </span>
+        <span class="strong">9.45% </span>
         <span class="quiet">Lines</span>
-        <span class='fraction'>52/333</span>
+        <span class='fraction'>43/455</span>
       </div>
     </div>
   </div>
@@ -62,39 +62,52 @@ <h1>
 	<td class="file low" data-value="src/"><a href="src/index.html">src/</a></td>
 	<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>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="16" class="abs low">0/16</td>
+	<td data-value="17" class="abs low">0/17</td>
 	<td data-value="0" class="pct low">0%</td>
 	<td data-value="2" class="abs low">0/2</td>
 	<td data-value="0" class="pct low">0%</td>
 	<td data-value="1" class="abs low">0/1</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="16" class="abs low">0/16</td>
+	<td data-value="17" class="abs low">0/17</td>
 	</tr>
 
 <tr>
 	<td class="file low" data-value="src/features/"><a href="src/features/index.html">src/features/</a></td>
 	<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>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="177" class="abs low">0/177</td>
+	<td data-value="170" class="abs low">0/170</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="40" class="abs low">0/40</td>
+	<td data-value="54" class="abs low">0/54</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="19" class="abs low">0/19</td>
+	<td data-value="21" class="abs low">0/21</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="174" class="abs low">0/174</td>
+	<td data-value="162" class="abs low">0/162</td>
 	</tr>
 
 <tr>
 	<td class="file low" data-value="src/lib/"><a href="src/lib/index.html">src/lib/</a></td>
-	<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>
-	<td data-value="35.57" class="pct low">35.57%</td>
-	<td data-value="149" class="abs low">53/149</td>
-	<td data-value="40.48" class="pct low">40.48%</td>
-	<td data-value="42" class="abs low">17/42</td>
-	<td data-value="50" class="pct medium">50%</td>
-	<td data-value="10" class="abs medium">5/10</td>
-	<td data-value="36.36" class="pct low">36.36%</td>
-	<td data-value="143" class="abs low">52/143</td>
+	<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>
+	<td data-value="19.55" class="pct low">19.55%</td>
+	<td data-value="220" class="abs low">43/220</td>
+	<td data-value="10.53" class="pct low">10.53%</td>
+	<td data-value="76" class="abs low">8/76</td>
+	<td data-value="29.41" class="pct low">29.41%</td>
+	<td data-value="17" class="abs low">5/17</td>
+	<td data-value="20.48" class="pct low">20.48%</td>
+	<td data-value="210" class="abs low">43/210</td>
+	</tr>
+
+<tr>
+	<td class="file low" data-value="src/lib/parsers/"><a href="src/lib/parsers/index.html">src/lib/parsers/</a></td>
+	<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>
+	<td data-value="0" class="pct low">0%</td>
+	<td data-value="70" class="abs low">0/70</td>
+	<td data-value="0" class="pct low">0%</td>
+	<td data-value="38" class="abs low">0/38</td>
+	<td data-value="0" class="pct low">0%</td>
+	<td data-value="4" class="abs low">0/4</td>
+	<td data-value="0" class="pct low">0%</td>
+	<td data-value="66" class="abs low">0/66</td>
 	</tr>
 
 </tbody>
@@ -103,7 +116,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Aug 06 2017 02:54:54 GMT-0300 (-03)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Apr 15 2018 18:43:07 GMT+0200 (CEST)
 </div>
 </div>
 <script src="prettify.js"></script>

diff --git a/coverage/src/extension.ts.html b/coverage/src/extension.ts.html
@@ -22,7 +22,7 @@ <h1>
       <div class='fl pad1y space-right2'>
         <span class="strong">0% </span>
         <span class="quiet">Statements</span>
-        <span class='fraction'>0/16</span>
+        <span class='fraction'>0/17</span>
       </div>
       <div class='fl pad1y space-right2'>
         <span class="strong">0% </span>
@@ -37,7 +37,7 @@ <h1>
       <div class='fl pad1y space-right2'>
         <span class="strong">0% </span>
         <span class="quiet">Lines</span>
-        <span class='fraction'>0/16</span>
+        <span class='fraction'>0/17</span>
       </div>
     </div>
   </div>
@@ -67,7 +67,14 @@ <h1>
 22
 23
 24
-25</td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+25
+26
+27
+28
+29
+30
+31
+32</td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -80,48 +87,62 @@ <h1>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">// src/extension.ts
-<span class="cstat-no" title="statement not covered" >import * as vscode from 'vscode';</span>
+<span class="cstat-no" title="statement not covered" >import * as vscode from "vscode";</span>
 &nbsp;
-<span class="cstat-no" title="statement not covered" >import FortranLintingProvider from './features/linter-provider';</span>
-<span class="cstat-no" title="statement not covered" >import FortranHoverProvider from './features/hover-provider';</span>
-<span class="cstat-no" title="statement not covered" >import { FortranCompletionProvider } from './features/completion-provider';</span>
-<span class="cstat-no" title="statement not covered" >import { FortranDocumentSymbolProvider } from './features/document-symbol-provider';</span>
+<span class="cstat-no" title="statement not covered" >import FortranLintingProvider from "./features/linter-provider";</span>
+<span class="cstat-no" title="statement not covered" >import FortranHoverProvider from "./features/hover-provider";</span>
+<span class="cstat-no" title="statement not covered" >import { FortranCompletionProvider } from "./features/completion-provider";</span>
+<span class="cstat-no" title="statement not covered" >import { FortranDocumentSymbolProvider } from "./features/document-symbol-provider";</span>
 &nbsp;
-<span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" >export function activate(context: vscode.ExtensionContext)</span> {</span>
-&nbsp;
-<span class="cstat-no" title="statement not covered" >    let hoverProvider = new FortranHoverProvider();</span>
-<span class="cstat-no" title="statement not covered" >    let completionProvider = new FortranCompletionProvider();</span>
-<span class="cstat-no" title="statement not covered" >    let symbolProvider = new FortranDocumentSymbolProvider();</span>
+<span class="cstat-no" title="statement not covered" >const FORTRAN_FREE_FORM_ID = "fortran_free-form";</span>
 &nbsp;
-<span class="cstat-no" title="statement not covered" >    if (vscode.workspace.getConfiguration('fortran').get('linterEnabled', true)) {</span>
+<span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" >export function activate(context: vscode.ExtensionContext)</span> {</span>
+<span class="cstat-no" title="statement not covered" >  let hoverProvider = new FortranHoverProvider();</span>
+<span class="cstat-no" title="statement not covered" >  let completionProvider = new FortranCompletionProvider();</span>
+<span class="cstat-no" title="statement not covered" >  let symbolProvider = new FortranDocumentSymbolProvider();</span>
 &nbsp;
-<span class="cstat-no" title="statement not covered" >        let linter = new FortranLintingProvider();</span>
-<span class="cstat-no" title="statement not covered" >        linter.activate(context.subscriptions);</span>
-<span class="cstat-no" title="statement not covered" >        vscode.languages.registerCodeActionsProvider('fortran90', linter);</span>
-    }
+<span class="cstat-no" title="statement not covered" >  if (vscode.workspace.getConfiguration("fortran").get("linterEnabled", true)) {</span>
+<span class="cstat-no" title="statement not covered" >    let linter = new FortranLintingProvider();</span>
+<span class="cstat-no" title="statement not covered" >    linter.activate(context.subscriptions);</span>
+<span class="cstat-no" title="statement not covered" >    vscode.languages.registerCodeActionsProvider(FORTRAN_FREE_FORM_ID, linter);</span>
+  }
 &nbsp;
-<span class="cstat-no" title="statement not covered" >    vscode.languages.registerCompletionItemProvider('fortran90', completionProvider);</span>
-<span class="cstat-no" title="statement not covered" >    vscode.languages.registerHoverProvider('fortran90', hoverProvider);</span>
-<span class="cstat-no" title="statement not covered" >    vscode.languages.registerDocumentSymbolProvider('fortran90', symbolProvider);</span>
-}</pre></td></tr>
+<span class="cstat-no" title="statement not covered" >  vscode.languages.registerCompletionItemProvider(</span>
+    FORTRAN_FREE_FORM_ID,
+    completionProvider
+  );
+<span class="cstat-no" title="statement not covered" >  vscode.languages.registerHoverProvider(FORTRAN_FREE_FORM_ID, hoverProvider);</span>
+<span class="cstat-no" title="statement not covered" >  vscode.languages.registerDocumentSymbolProvider(</span>
+    FORTRAN_FREE_FORM_ID,
+    symbolProvider
+  );
+}
+&nbsp;</pre></td></tr>
 </table></pre>
 <div class='push'></div><!-- for sticky footer -->
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Aug 06 2017 02:54:54 GMT-0300 (-03)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Apr 15 2018 18:43:07 GMT+0200 (CEST)
 </div>
 </div>
 <script src="../prettify.js"></script>