// src/extension.ts
-import * as vscode from 'vscode';
+import * as vscode from "vscode";
-import FortranLintingProvider from './features/linter-provider';
-import FortranHoverProvider from './features/hover-provider';
-import { FortranCompletionProvider } from './features/completion-provider';
-import { FortranDocumentSymbolProvider } from './features/document-symbol-provider';
+import FortranLintingProvider from "./features/linter-provider";
+import FortranHoverProvider from "./features/hover-provider";
+import { FortranCompletionProvider } from "./features/completion-provider";
+import { FortranDocumentSymbolProvider } from "./features/document-symbol-provider";
-export function activate(context: vscode.ExtensionContext) {
-
- let hoverProvider = new FortranHoverProvider();
- let completionProvider = new FortranCompletionProvider();
- let symbolProvider = new FortranDocumentSymbolProvider();
+const FORTRAN_FREE_FORM_ID = "fortran_free-form";
- if (vscode.workspace.getConfiguration('fortran').get('linterEnabled', true)) {
+export function activate(context: vscode.ExtensionContext) {
+ let hoverProvider = new FortranHoverProvider();
+ let completionProvider = new FortranCompletionProvider();
+ let symbolProvider = new FortranDocumentSymbolProvider();
- let linter = new FortranLintingProvider();
- linter.activate(context.subscriptions);
- vscode.languages.registerCodeActionsProvider('fortran90', linter);
- }
+ if (vscode.workspace.getConfiguration("fortran").get("linterEnabled", true)) {
+ let linter = new FortranLintingProvider();
+ linter.activate(context.subscriptions);
+ vscode.languages.registerCodeActionsProvider(FORTRAN_FREE_FORM_ID, linter);
+ }
- vscode.languages.registerCompletionItemProvider('fortran90', completionProvider);
- vscode.languages.registerHoverProvider('fortran90', hoverProvider);
- vscode.languages.registerDocumentSymbolProvider('fortran90', symbolProvider);
-} |
+
69
70
71
-72|
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106 |
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -140,6 +189,7 @@
+
@@ -147,11 +197,18 @@
+
+
+
+
+
+
+
@@ -165,96 +222,141 @@
+
+
+
+
+
-
+
+
+
+
+
-
+
- |
-
-import { CancellationToken, TextDocument, Position, Hover } from "vscode";
-import * as fs from 'fs';
-import * as vscode from 'vscode';
-import { isPositionInString, intrinsics, FORTRAN_KEYWORDS } from "../lib/helper";
+
+
+ | import { CancellationToken, TextDocument, Position, Hover } from "vscode";
+import * as fs from "fs";
+import * as vscode from "vscode";
+import {
+ isPositionInString,
+ intrinsics,
+ FORTRAN_KEYWORDS
+} from "../lib/helper";
import { getDeclaredFunctions } from "../lib/functions";
+export class FortranCompletionProvider
+ implements vscode.CompletionItemProvider {
+ public provideCompletionItems(
+ document: vscode.TextDocument,
+ position: vscode.Position,
+ token: vscode.CancellationToken
+ ): Thenable<vscode.CompletionItem[]> {
+ return this.provideCompletionItemsInternal(
+ document,
+ position,
+ token,
+ vscode.workspace.getConfiguration("go")
+ );
+ }
+ public provideCompletionItemsInternal(
+ document: vscode.TextDocument,
+ position: vscode.Position,
+ token: vscode.CancellationToken,
+ config: vscode.WorkspaceConfiguration
+ ): Thenable<vscode.CompletionItem[]> {
+ return new Promise<vscode.CompletionItem[]>((resolve, reject) => {
+ let filename = document.fileName;
+ let lineText = document.lineAt(position.line).text;
+ let lineTillCurrentPosition = lineText.substr(0, position.character);
+ // nothing to complete
+ if (lineText.match(/^\s*\/\//)) {
+ return resolve([]);
+ }
-export class FortranCompletionProvider implements vscode.CompletionItemProvider {
-
- public provideCompletionItems(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken): Thenable<vscode.CompletionItem[]> {
- return this.provideCompletionItemsInternal(document, position, token, vscode.workspace.getConfiguration('go'));
- }
- public provideCompletionItemsInternal(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken, config: vscode.WorkspaceConfiguration): Thenable<vscode.CompletionItem[]> {
- return new Promise<vscode.CompletionItem[]>((resolve, reject) => {
- let filename = document.fileName;
- let lineText = document.lineAt(position.line).text;
- let lineTillCurrentPosition = lineText.substr(0, position.character);
- // nothing to complete
- if (lineText.match(/^\s*\/\//)) {
- return resolve([]);
- }
-
- let inString = isPositionInString(document, position);
- if (!inString && lineTillCurrentPosition.endsWith('\"')) { // completing a string
- return resolve([]);
- }
-
- // get current word
- let wordAtPosition = document.getWordRangeAtPosition(position);
- let currentWord = '';
- if (wordAtPosition && wordAtPosition.start.character < position.character) {
- let word = document.getText(wordAtPosition);
- currentWord = word.substr(0, position.character - wordAtPosition.start.character);
- }
-
- if (currentWord.match(/^\d+$/)) { // starts with a number
- return resolve([]);
- }
+ let inString = isPositionInString(document, position);
+ if (!inString && lineTillCurrentPosition.endsWith('"')) {
+ // completing a string
+ return resolve([]);
+ }
- let suggestions = [];
+ // get current word
+ let wordAtPosition = document.getWordRangeAtPosition(position);
+ let currentWord = "";
+ if (
+ wordAtPosition &&
+ wordAtPosition.start.character < position.character
+ ) {
+ let word = document.getText(wordAtPosition);
+ currentWord = word.substr(
+ 0,
+ position.character - wordAtPosition.start.character
+ );
+ }
- if (currentWord.length > 0) {
- intrinsics.forEach(intrinsic => {
- if (intrinsic.startsWith(currentWord.toUpperCase())) {
- suggestions.push(new vscode.CompletionItem(intrinsic, vscode.CompletionItemKind.Method));
- }
- });
+ if (currentWord.match(/^\d+$/)) {
+ // starts with a number
+ return resolve([]);
+ }
- // add keyword suggestions
- FORTRAN_KEYWORDS.forEach(keyword => {
- if (keyword.startsWith(currentWord.toUpperCase())) {
- suggestions.push(new vscode.CompletionItem(keyword.toLowerCase(), vscode.CompletionItemKind.Keyword));
- }
- });
- }
- const functions = getDeclaredFunctions(document);
- // check for available functions
- functions.filter(fun => fun.name.startsWith(currentWord))
- .forEach(fun =>{
- suggestions.push(new vscode.CompletionItem(fun.name, vscode.CompletionItemKind.Function));
- });
-
+ let suggestions = [];
- return resolve(suggestions);
+ if (currentWord.length > 0) {
+ intrinsics.forEach(intrinsic => {
+ if (intrinsic.startsWith(currentWord.toUpperCase())) {
+ suggestions.push(
+ new vscode.CompletionItem(
+ intrinsic,
+ vscode.CompletionItemKind.Method
+ )
+ );
+ }
+ });
- })
+ // add keyword suggestions
+ FORTRAN_KEYWORDS.forEach(keyword => {
+ if (keyword.startsWith(currentWord.toUpperCase())) {
+ suggestions.push(
+ new vscode.CompletionItem(
+ keyword.toLowerCase(),
+ vscode.CompletionItemKind.Keyword
+ )
+ );
+ }
+ });
+ }
+ const functions = getDeclaredFunctions(document);
+ // check for available functions
+ functions.filter(fun => fun.name.startsWith(currentWord)).forEach(fun => {
+ suggestions.push(
+ new vscode.CompletionItem(
+ fun.name,
+ vscode.CompletionItemKind.Function
+ )
+ );
+ });
- }
+ return resolve(suggestions);
+ });
+ }
}
|
@@ -262,7 +364,7 @@
diff --git a/coverage/src/features/index.html b/coverage/src/features/index.html
index b37e1488..44f9ae38 100644
--- a/coverage/src/features/index.html
+++ b/coverage/src/features/index.html
@@ -22,22 +22,22 @@
0%
Statements
- 0/177
+ 0/170
0%
Branches
- 0/40
+ 0/54
0%
Functions
- 0/19
+ 0/21
0%
Lines
- 0/174
+ 0/162
@@ -72,16 +72,29 @@
- | document-symbol-provider.ts |
+ definition-provider.ts |
|
0% |
- 0/14 |
- 100% |
- 0/0 |
+ 0/13 |
+ 0% |
+ 0/6 |
0% |
0/1 |
0% |
- 0/14 |
+ 0/12 |
+
+
+
+ | document-symbol-provider.ts |
+ |
+ 0% |
+ 0/52 |
+ 0% |
+ 0/18 |
+ 0% |
+ 0/8 |
+ 0% |
+ 0/48 |
@@ -110,26 +123,13 @@
| 0/62 |
-
- | linterProvider.ts |
- |
- 0% |
- 0/58 |
- 0% |
- 0/10 |
- 0% |
- 0/6 |
- 0% |
- 0/58 |
-
-
diff --git a/coverage/src/index.html b/coverage/src/index.html
index 467f1d9d..302aebcc 100644
--- a/coverage/src/index.html
+++ b/coverage/src/index.html
@@ -22,7 +22,7 @@
0%
Statements
- 0/16
+ 0/17
0%
@@ -37,7 +37,7 @@
0%
Lines
- 0/16
+ 0/17
@@ -62,13 +62,13 @@
| extension.ts |
|
0% |
- 0/16 |
+ 0/17 |
0% |
0/2 |
0% |
0/1 |
0% |
- 0/16 |
+ 0/17 |
@@ -77,7 +77,7 @@
diff --git a/package.json b/package.json
index ce96c4bd..27712df3 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"displayName": "Modern Fortran",
"description":
"Modern Fortran language support, including syntax highlighting and error detection.",
- "version": "1.0.1",
+ "version": "1.1.0",
"publisher": "krvajalm",
"engines": {
"vscode": "^1.19.0"
@@ -97,9 +97,8 @@
"vscode:prepublish": "tsc -p ./",
"compile": "tsc -watch -p ./",
"postinstall": "node ./node_modules/vscode/bin/install",
- "test": "node ./node_modules/vscode/bin/test",
- "lint":
- "node ./node_modules/tslint/bin/tslint ./src/*.ts ./src/debugAdapter/*.ts ./test/*.ts"
+ "test": "CODE_TESTS_WORKSPACE='./' node ./node_modules/vscode/bin/test",
+ "lint": "node ./node_modules/tslint/bin/tslint ./src/**/*.ts "
},
"devDependencies": {
"@types/glob": "^5.0.30",
diff --git a/src/features/document-symbol-provider.ts b/src/features/document-symbol-provider.ts
index 5463fc0f..3d657ae5 100644
--- a/src/features/document-symbol-provider.ts
+++ b/src/features/document-symbol-provider.ts
@@ -51,13 +51,13 @@ export class FortranDocumentSymbolProvider
const symbolsInLine = symbolTypes
.map(type => this.getSymbolsOfType(type))
.map(fn => fn(line))
- .filter(symb => symb != undefined);
+ .filter(symb => symb !== undefined);
if (symbolsInLine.length > 0) {
symbols = symbols.concat(symbolsInLine);
}
}
return symbols;
- };
+ }
getSymbolsOfType(type: "subroutine" | "function" | "variable"): ParserFunc {
switch (type) {
case "subroutine":
diff --git a/src/lib/helper.ts b/src/lib/helper.ts
index 0da45be2..528c3c6d 100644
--- a/src/lib/helper.ts
+++ b/src/lib/helper.ts
@@ -27,13 +27,13 @@ export const FORTRAN_KEYWORDS = ["FUNCTION", "MODULE", "SUBROUTINE", "CONTAINS",
export const isIntrinsic = (keyword) => {
return intrinsics.findIndex(intrinsic => intrinsic === keyword.toUpperCase()) !== -1;
-}
+};
interface Doc {
keyword: string;
docstr: string;
-}
+};
export const loadDocString = (keyword) => {
@@ -43,12 +43,13 @@ export const loadDocString = (keyword) => {
let doc: Doc = JSON.parse(docstr);
return doc.docstr;
-}
+};
+
export const _loadDocString = (keyword: string) => {
keyword = keyword.toUpperCase();
- let docStringBuffer = fs.readFileSync(__dirname + "/../../../src/docs/" + keyword + ".html")
+ let docStringBuffer = fs.readFileSync(__dirname + "/../../../src/docs/" + keyword + ".html");
let docText = docStringBuffer.toString();
const codeRegex = /(.+?)<\/code>\n?/g;
const varRegex = /(.+?)<\/var>/g;
@@ -79,7 +80,7 @@ export const _loadDocString = (keyword: string) => {
docText = docText.replace(/^ *
\n?/gm, '\n').replace(/<\?dl>/g, "");
console.log(docText);
return docText;
-}
+};
export const getIncludeParams = (paths: string[]) => {
if (paths.length === 0) {
@@ -110,5 +111,5 @@ let saveKeywordToJson = (keyword) => {
if (err) throw err;
console.log('Saved!');
});
-};
+};
diff --git a/src/lib/tokenizer.ts b/src/lib/tokenizer.ts
index 0f47e15a..ae7724c1 100644
--- a/src/lib/tokenizer.ts
+++ b/src/lib/tokenizer.ts
@@ -1,60 +1,54 @@
-
-
-
export enum TokenType {
- FUNCTION,
- SUBROUTINE,
- NUMBER,
- VARIABLE,
- END,
- DO,
- IF,
- LEFT_PARENTESIS,
- RIGHT_PARENTESIS,
- COMMA,
- BINARY_OPERATOR
+ FUNCTION,
+ SUBROUTINE,
+ NUMBER,
+ VARIABLE,
+ END,
+ DO,
+ IF,
+ LEFT_PARENTESIS,
+ RIGHT_PARENTESIS,
+ COMMA,
+ BINARY_OPERATOR
}
-
export interface TokenInfo {
-
- pattern: RegExp;
- token: TokenType;
-
+ pattern: RegExp;
+ token: TokenType;
}
-export interface Token {
- token: TokenType;
- sequence: string;
+export interface Token {
+ token: TokenType;
+ sequence: string;
}
+
export class Tokenizer {
-
- tokenInfos: TokenInfo[];
- public tokens: Token[];
- constructor(){
- this.tokenInfos = [];
- this.tokens = [];
- }
- public add(regex, token){
- this.tokenInfos.push({pattern:regex, token: token});
- }
- public tokenize(expression:string){
- this.tokens = [];
- while(expression !== ''){
- let match = false;
- for(let i = 0; i < this.tokenInfos.length; i++){
- let info = this.tokenInfos[i];
- let result = info.pattern.exec(expression);
- console.log(expression);
- if(result && result.length > 0){
- match = true;
- this.tokens.push({token: info.token, sequence: result[0].trim()});
- expression = expression.replace(info.pattern,"");
- break;
- }
- }
+ tokenInfos: TokenInfo[];
+ public tokens: Token[];
+ constructor() {
+ this.tokenInfos = [];
+ this.tokens = [];
+ }
+
+ public add(regex, token) {
+ this.tokenInfos.push({ pattern: regex, token: token });
+ }
+
+ public tokenize(expression: string) {
+ this.tokens = [];
+ while (expression !== "") {
+ let match = false;
+ for (let i = 0; i < this.tokenInfos.length; i++) {
+ let info = this.tokenInfos[i];
+ let result = info.pattern.exec(expression);
+
+ if (result && result.length > 0) {
+ match = true;
+ this.tokens.push({ token: info.token, sequence: result[0].trim() });
+ expression = expression.replace(info.pattern, "");
+ break;
}
-
+ }
}
-
-}
\ No newline at end of file
+ }
+}
diff --git a/syntaxes/fortran_free-form.tmLanguage.json b/syntaxes/fortran_free-form.tmLanguage.json
index 26312f77..ecf99d7e 100644
--- a/syntaxes/fortran_free-form.tmLanguage.json
+++ b/syntaxes/fortran_free-form.tmLanguage.json
@@ -13,30 +13,10 @@
"F08"
],
"firstLineMatch": "(?i)-[*]- mode: fortran free -[*]-",
- "injections": {
- "source.fortran.free - ( string | comment | meta.preprocessor )": {
- "patterns": [
- {
- "include": "#line-continuation-operator"
- }
- ]
- },
- "string.quoted.double.fortran": {
- "patterns": [
- {
- "include": "#string-line-continuation-operator"
- }
- ]
- },
- "string.quoted.single.fortran": {
- "patterns": [
- {
- "include": "#string-line-continuation-operator"
- }
- ]
- }
- },
"patterns": [
+ {
+ "include": "#preprocessor"
+ },
{
"include": "#comments"
},
@@ -114,6 +94,366 @@
}
],
"repository": {
+ "preprocessor": {
+ "begin": "^\\s*(#)",
+ "beginCaptures": {
+ "1": {
+ "name": "keyword.preprocessor.indicator.fortran"
+ }
+ },
+ "end": "\\n",
+ "patterns": [
+ {
+ "include": "#preprocessor-if-construct"
+ },
+ {
+ "include": "#preprocessor-statements"
+ }
+ ]
+ },
+ "preprocessor-comments": {
+ "name": "comment.preprocessor",
+ "begin": "/\\*",
+ "end": "\\*/"
+ },
+ "preprocessor-constants": {
+ "patterns": [
+ {
+ "include": "#preprocessor-numeric-constant"
+ },
+ {
+ "include": "#preprocessor-string-constant"
+ }
+ ]
+ },
+ "preprocessor-numeric-constant": {
+ "comment": "Numeric constants",
+ "name": "constant.numeric.fortran",
+ "match": "(?ix)[\\+\\-]?(\\b\\d+\\.?\\d*|\\.\\d+) (_\\w+|d[\\+\\-]?\\d+|e[\\+\\-]?\\d+(_\\w+)?)?(?![a-z_])"
+ },
+ "preprocessor-string-constant": {
+ "patterns": [
+ {
+ "comment": "Double quote string",
+ "name": "string.quoted.double.include.preprocessor.fortran",
+ "begin": "\"",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.definition.string.begin.preprocessor.fortran"
+ }
+ },
+ "end": "\"",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.definition.string.end.preprocessor.fortran"
+ }
+ }
+ },
+ {
+ "comment": "Single quote string",
+ "name": "string.quoted.single.include.preprocessor.fortran",
+ "begin": "'",
+ "beginCaptures": {
+ "0": {
+ "name": "punctuation.definition.string.begin.preprocessor.fortran"
+ }
+ },
+ "end": "'",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.definition.string.end.preprocessor.fortran"
+ }
+ }
+ }
+ ]
+ },
+ "preprocessor-if-construct": {
+ "patterns": [
+ {
+ "begin": "(?i)\\G\\s*\\b(if)\\b",
+ "beginCaptures": {
+ "1": {
+ "name": "keyword.preprocessor.if.fortran"
+ }
+ },
+ "end": "(?=\\n)",
+ "patterns": [
+ {
+ "include": "#preprocessor-comments"
+ },
+ {
+ "include": "#preprocessor-numeric-constant"
+ },
+ {
+ "include": "#preprocessor-logical-operators"
+ },
+ {
+ "include": "#preprocessor-defined-function"
+ }
+ ]
+ },
+ {
+ "begin": "(?i)\\G\\s*\\b(ifdef)\\b",
+ "beginCaptures": {
+ "1": {
+ "name": "keyword.preprocessor.ifdef.fortran"
+ }
+ },
+ "end": "(?=\\n)",
+ "patterns": [
+ {
+ "include": "#preprocessor-comments"
+ },
+ {
+ "include": "#preprocessor-numeric-constant"
+ },
+ {
+ "include": "#preprocessor-logical-operators"
+ }
+ ]
+ },
+ {
+ "begin": "(?i)\\G\\s*\\b(ifndef)\\b",
+ "beginCaptures": {
+ "1": {
+ "name": "keyword.preprocessor.ifndef.fortran"
+ }
+ },
+ "end": "(?=\\n)",
+ "patterns": [
+ {
+ "include": "#preprocessor-comments"
+ },
+ {
+ "include": "#preprocessor-numeric-constant"
+ },
+ {
+ "include": "#preprocessor-logical-operators"
+ }
+ ]
+ },
+ {
+ "begin": "(?i)\\G\\s*\\b(else)\\b",
+ "beginCaptures": {
+ "1": {
+ "name": "keyword.preprocessor.else.fortran"
+ }
+ },
+ "end": "(?=\\n)",
+ "patterns": [
+ {
+ "include": "#preprocessor-comments"
+ },
+ {
+ "include": "#preprocessor-numeric-constant"
+ }
+ ]
+ },
+ {
+ "begin": "(?i)\\G\\s*\\b(elif)\\b",
+ "beginCaptures": {
+ "1": {
+ "name": "keyword.preprocessor.elif.fortran"
+ }
+ },
+ "end": "(?=\\n)",
+ "patterns": [
+ {
+ "include": "#preprocessor-comments"
+ },
+ {
+ "include": "#preprocessor-numeric-constant"
+ },
+ {
+ "include": "#preprocessor-logical-operators"
+ },
+ {
+ "include": "#preprocessor-defined-function"
+ }
+ ]
+ },
+ {
+ "begin": "(?i)\\G\\s*\\b(endif)\\b",
+ "beginCaptures": {
+ "1": {
+ "name": "keyword.preprocessor.endif.fortran"
+ }
+ },
+ "end": "(?=\\n)",
+ "patterns": [
+ {
+ "include": "#preprocessor-comments"
+ }
+ ]
+ }
+ ]
+ },
+ "preprocessor-defined-function": {
+ "match": "(?i)\\b(defined)\\b",
+ "captures": {
+ "1": {
+ "name": "keyword.define.preprocessor.fortran"
+ }
+ }
+ },
+ "preprocessor-operators": {
+ "patterns": [
+ {
+ "include": "#preprocessor-assignment-operator"
+ },
+ {
+ "include": "#preprocessor-line-continuation-operator"
+ },
+ {
+ "include": "#preprocessor-logical-operators"
+ }
+ ]
+ },
+ "preprocessor-assignment-operator": {
+ "name": "keyword.operator.assignment.preprocessor.fortran",
+ "match": "(?",
+ "endCaptures": {
+ "0": {
+ "name": "punctuation.definition.string.end.preprocessor.fortran"
+ }
+ }
+ },
+ {
+ "include": "#line-continuation-operator"
+ }
+ ]
+ },
+ "preprocessor-pragma-statement": {
+ "begin": "(?i)\\G\\s*\\b(pragma)\\b",
+ "beginCaptures": {
+ "1": {
+ "name": "keyword.pragma.preprocessor.fortran"
+ }
+ },
+ "end": "(?=\\n)",
+ "patterns": [
+ {
+ "include": "#preprocessor-comments"
+ },
+ {
+ "include": "#preprocessor-string-constant"
+ }
+ ]
+ },
+ "preprocessor-undefine-statement": {
+ "begin": "(?i)\\G\\s*\\b(undef)\\b",
+ "beginCaptures": {
+ "1": {
+ "name": "keyword.undef.preprocessor.fortran"
+ }
+ },
+ "end": "(?=\\n)",
+ "patterns": [
+ {
+ "include": "#preprocessor-comments"
+ }
+ ]
+ },
"abstract-attribute": {
"comment": "Introduced in the Fortran 2003 standard.",
"match": "(?i)\\G\\s*\\b(abstract)\\b",
@@ -2990,7 +3330,7 @@
},
"arithmetic-operators": {
"comment": "Introduced in the Fortran 1977 standard.",
- "match": "(\\-)|(\\+)|(\\/)|(\\*\\*)|(\\*)",
+ "match": "(\\-)|(\\+)|\\/(?!\\/|\\=|\\\\)|(\\*\\*)|(\\*)",
"captures": {
"1": {
"name": "keyword.operator.subtraction.fortran"
@@ -3012,14 +3352,14 @@
"assignment-operator": {
"comment": "Introduced in the Fortran 1977 standard.",
"name": "keyword.operator.assignment.fortran",
- "match": "(?)"
},
"derived-type-operators": {
"comment": "Introduced in the Fortran 1995 standard.",
"match": "\\s*(\\%)",
"captures": {
"1": {
- "name": "keyword.operator.selector.fortran"
+ "name": "keyword.other.selector.fortran"
}
}
},
@@ -3064,24 +3404,24 @@
"patterns": [
{
"comment": "Introduced in the Fortran 1977 standard.",
- "match": "(?ix)(\\.(and|eq|eqv|le|lt|ge|gt|ne|neqv|not|or)\\.)",
- "name": "keyword.fortran"
+ "match": "(?ix)(\\s*\\.(and|eq|eqv|le|lt|ge|gt|ne|neqv|not|or)\\.)",
+ "name": "keyword.logical.fortran"
},
{
"comment": "Introduced in the Fortran 1990 standard.",
- "name": "keyword.operator.logical.fortran.modern",
- "match": "(\\=\\=|\\/\\=|\\>\\=|\\>|\\<|\\<\\=)"
+ "name": "keyword.logical.fortran.modern",
+ "match": "(\\=\\=|\\/\\=|\\>\\=|(?|\\<|\\<\\=)"
}
]
},
"pointer-operators": {
"comment": "Introduced in the Fortran 1990 standard.",
- "name": "keyword.operator.point.fortran",
+ "name": "keyword.other.point.fortran",
"match": "(\\=\\>)"
},
"string-operators": {
"comment": "Introduced in the Fortran 19?? standard.",
- "name": "keyword.operator.concatination.fortran",
+ "name": "keyword.other.concatination.fortran",
"match": "(\\/\\/)"
},
"string-line-continuation-operator": {
@@ -3352,7 +3692,7 @@
"match": "(?i)\\G\\s*\\b(program)\\b",
"captures": {
"1": {
- "name": "keyword.other.program.fortran"
+ "name": "keyword.control.program.fortran"
}
}
},
@@ -3367,13 +3707,13 @@
"end": "(?ix)\\b(?:(end\\s*program)(?:\\s+(\\1))?|(end))\\b\\s*([^;!\\n]+)?(?=[;!\\n])",
"endCaptures": {
"1": {
- "name": "keyword.other.endprogram.fortran"
+ "name": "keyword.control.endprogram.fortran"
},
"2": {
"name": "entity.name.program.fortran"
},
"3": {
- "name": "keyword.other.endprogram.fortran"
+ "name": "keyword.control.endprogram.fortran"
},
"4": {
"name": "invalid.error.fortran"
@@ -4793,4 +5133,4 @@
]
}
}
-}
\ No newline at end of file
+}
diff --git a/test/extension.test.ts b/test/extension.test.ts
index 578517c9..a034bc80 100644
--- a/test/extension.test.ts
+++ b/test/extension.test.ts
@@ -4,24 +4,24 @@
//
// The module 'assert' provides assertion methods from node
-import * as assert from 'assert';
-import * as fs from 'fs';
-import { _loadDocString, intrinsics} from '../src/lib/helper';
+import * as assert from "assert";
+import * as fs from "fs";
// You can import and use all API from the 'vscode' module
// as well as import your extension to test it
-import * as vscode from 'vscode';
-import * as myExtension from '../src/extension';
+import * as vscode from "vscode";
+import * as myExtension from "../src/extension";
+import { FortranDocumentSymbolProvider } from "../src/features/document-symbol-provider";
// Defines a Mocha test suite to group tests of similar kind together
-suite('Extension Tests', () => {
-
- // Defines a Mocha unit test
- test('Something 1', () => {
- assert.equal(-1, [1, 2, 3].indexOf(5));
- assert.equal(-1, [1, 2, 3].indexOf(0));
- });
-
+suite("Extension Tests", () => {
+ test("symbol provider works as expected", async () => {
+ const filePath = "/test/resources/sample.f90";
+ const openPath = vscode.Uri.file(`${vscode.workspace.rootPath}${filePath}`);
+ const doc = await vscode.workspace.openTextDocument(openPath);
+ vscode.window.showTextDocument(doc);
+ const symbolProvider = new FortranDocumentSymbolProvider();
+ const symbols = await symbolProvider.provideDocumentSymbols(doc, null);
+ assert.equal(symbols.length, 1);
+ });
});
-
-
diff --git a/test/index.ts b/test/index.ts
index 5128ef85..496cf0bd 100644
--- a/test/index.ts
+++ b/test/index.ts
@@ -1,218 +1,25 @@
-"use strict";
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for details.
-import * as fs from "fs";
-import * as glob from "glob";
-import * as paths from "path";
+// This file is used by VS Code's default test runner to configure Mocha before the test run.
-const istanbul = require("istanbul");
-const Mocha = require("mocha");
-const remapIstanbul = require("remap-istanbul");
+/* tslint:disable:no-var-keyword no-var-requires */
+var testRunner = require("vscode/lib/testrunner");
+/* tslint:enable:no-var-keyword no-var-requires */
-// Linux: prevent a weird NPE when mocha on Linux requires the window size from the TTY
-// Since we are not running in a tty environment, we just implementt he method statically
-const tty = require("tty");
-if (!tty.getWindowSize) {
- tty.getWindowSize = (): number[] => {
- return [80, 75];
- };
-}
-
-let mocha = new Mocha({
- ui: "tdd",
- useColors: true,
-});
-
-function configure(mochaOpts): void {
- mocha = new Mocha(mochaOpts);
-}
-exports.configure = configure;
-
-function _mkDirIfExists(dir: string): void {
- if (!fs.existsSync(dir)) {
- fs.mkdirSync(dir);
- }
-}
-
-function _readCoverOptions(testsRoot: string): ITestRunnerOptions {
- let coverConfigPath = paths.join(testsRoot, "..", "..", "coverconfig.json");
- let coverConfig: ITestRunnerOptions = undefined;
- if (fs.existsSync(coverConfigPath)) {
- let configContent = fs.readFileSync(coverConfigPath, "utf-8");
- coverConfig = JSON.parse(configContent);
- }
- return coverConfig;
-}
+let mochaOptions: any = {
+ ui: "tdd",
+ useColors: true,
+ invert: true,
+ grep: "debuggerContext" // Do not run tests intended for the debuggerContext
+};
-function run(testsRoot, clb): any {
- // Enable source map support
- require("source-map-support").install();
-
- // Read configuration for the coverage file
- let coverOptions: ITestRunnerOptions = _readCoverOptions(testsRoot);
- if (coverOptions && coverOptions.enabled) {
- // Setup coverage pre-test, including post-test hook to report
- let coverageRunner = new CoverageRunner(coverOptions, testsRoot, clb);
- coverageRunner.setupCoverage();
- }
-
- // Glob test files
- glob("**/**.test.js", { cwd: testsRoot }, (error, files): any => {
- if (error) {
- return clb(error);
- }
- try {
- // Fill into Mocha
- files.forEach((f): Mocha => {
- return mocha.addFile(paths.join(testsRoot, f));
- });
- // Run the tests
- let failureCount = 0;
-
- mocha.run()
- .on("fail", (test, err): void => {
- failureCount++;
- })
- .on("end", (): void => {
- clb(undefined, failureCount);
- });
- } catch (error) {
- return clb(error);
- }
- });
-}
-exports.run = run;
-
-interface ITestRunnerOptions {
- enabled?: boolean;
- relativeCoverageDir: string;
- relativeSourcePath: string;
- ignorePatterns: string[];
- includePid?: boolean;
- reports?: string[];
- verbose?: boolean;
+// Look for the env variable to decide wheter to use the TeamCity reporter or not
+if (process.env.VSCODE_REACT_NATIVE_TEAMCITY_TEST) {
+ mochaOptions.reporter = "mocha-teamcity-reporter";
}
-class CoverageRunner {
-
- private coverageVar: string = "$$cov_" + new Date().getTime() + "$$";
- private transformer: any = undefined;
- private matchFn: any = undefined;
- private instrumenter: any = undefined;
-
- constructor(private options: ITestRunnerOptions, private testsRoot: string, private endRunCallback: any) {
- if (!options.relativeSourcePath) {
- return endRunCallback("Error - relativeSourcePath must be defined for code coverage to work");
- }
-
- }
-
- public setupCoverage(): void {
- // Set up Code Coverage, hooking require so that instrumented code is returned
- let self = this;
- self.instrumenter = new istanbul.Instrumenter({ coverageVariable: self.coverageVar });
- let sourceRoot = paths.join(self.testsRoot, self.options.relativeSourcePath);
-
- // Glob source files
- let srcFiles = glob.sync("**/**.js", {
- cwd: sourceRoot,
- ignore: self.options.ignorePatterns,
- });
-
- // Create a match function - taken from the run-with-cover.js in istanbul.
- let decache = require("decache");
- let fileMap = {};
- srcFiles.forEach( (file) => {
- let fullPath = paths.join(sourceRoot, file);
- fileMap[fullPath] = true;
-
- // On Windows, extension is loaded pre-test hooks and this mean we lose
- // our chance to hook the Require call. In order to instrument the code
- // we have to decache the JS file so on next load it gets instrumented.
- // This doesn"t impact tests, but is a concern if we had some integration
- // tests that relied on VSCode accessing our module since there could be
- // some shared global state that we lose.
- decache(fullPath);
- });
-
- self.matchFn = (file): boolean => { return fileMap[file]; };
- self.matchFn.files = Object.keys(fileMap);
-
- // Hook up to the Require function so that when this is called, if any of our source files
- // are required, the instrumented version is pulled in instead. These instrumented versions
- // write to a global coverage variable with hit counts whenever they are accessed
- self.transformer = self.instrumenter.instrumentSync.bind(self.instrumenter);
- let hookOpts = { verbose: false, extensions: [".js"]};
- istanbul.hook.hookRequire(self.matchFn, self.transformer, hookOpts);
-
- // initialize the global variable to stop mocha from complaining about leaks
- global[self.coverageVar] = {};
-
- // Hook the process exit event to handle reporting
- // Only report coverage if the process is exiting successfully
- process.on("exit", (code) => {
- self.reportCoverage();
- });
- }
-
- /**
- * Writes a coverage report. Note that as this is called in the process exit callback, all calls must be synchronous.
- *
- * @returns {void}
- *
- * @memberOf CoverageRunner
- */
- public reportCoverage(): void {
- let self = this;
- istanbul.hook.unhookRequire();
- let cov: any;
- if (typeof global[self.coverageVar] === "undefined" || Object.keys(global[self.coverageVar]).length === 0) {
- console.error("No coverage information was collected, exit without writing coverage information");
- return;
- } else {
- cov = global[self.coverageVar];
- }
-
- // TODO consider putting this under a conditional flag
- // Files that are not touched by code ran by the test runner is manually instrumented, to
- // illustrate the missing coverage.
- self.matchFn.files.forEach( (file) => {
- if (!cov[file]) {
- self.transformer(fs.readFileSync(file, "utf-8"), file);
-
- // When instrumenting the code, istanbul will give each FunctionDeclaration a value of 1 in coverState.s,
- // presumably to compensate for function hoisting. We need to reset this, as the function was not hoisted,
- // as it was never loaded.
- Object.keys(self.instrumenter.coverState.s).forEach( (key) => {
- self.instrumenter.coverState.s[key] = 0;
- });
-
- cov[file] = self.instrumenter.coverState;
- }
- });
-
- // TODO Allow config of reporting directory with
- let reportingDir = paths.join(self.testsRoot, self.options.relativeCoverageDir);
- let includePid = self.options.includePid;
- let pidExt = includePid ? ("-" + process.pid) : "";
- let coverageFile = paths.resolve(reportingDir, "coverage" + pidExt + ".json");
-
- _mkDirIfExists(reportingDir); // yes, do this again since some test runners could clean the dir initially created
-
- fs.writeFileSync(coverageFile, JSON.stringify(cov), "utf8");
-
- let remappedCollector = remapIstanbul.remap(cov, {warn: warning => {
- // We expect some warnings as any JS file without a typescript mapping will cause this.
- // By default, we"ll skip printing these to the console as it clutters it up
- if (self.options.verbose) {
- console.warn(warning);
- }
- }});
+// Register Mocha options
+testRunner.configure(mochaOptions);
- let reporter = new istanbul.Reporter(undefined, reportingDir);
- let reportTypes = (self.options.reports instanceof Array) ? self.options.reports : ["lcov"];
- reporter.addAll(reportTypes);
- reporter.write(remappedCollector, true, () => {
- console.log(`reports written to ${reportingDir}`);
- });
- }
-}
\ No newline at end of file
+module.exports = testRunner;
diff --git a/test/resources/sample.f90 b/test/resources/sample.f90
new file mode 100644
index 00000000..65e0f179
--- /dev/null
+++ b/test/resources/sample.f90
@@ -0,0 +1,15 @@
+program main
+ ! execution
+
+ call say_hello()
+
+contains
+
+ subroutine say_hello(a,b)
+ integer :: a,b
+
+ print *, "Hello, World!"
+ end subroutine say_hello
+
+
+end program main
\ No newline at end of file
diff --git a/test/tokenizer.test.ts b/test/tokenizer.test.ts
index 8a93f2d1..e9a76a7b 100644
--- a/test/tokenizer.test.ts
+++ b/test/tokenizer.test.ts
@@ -4,24 +4,28 @@ import * as assert from 'assert';
import * as fs from 'fs';
import { Tokenizer, TokenType } from '../src/lib/tokenizer';
-suite("function helper test", () => {
+suite("fortran tokenizer", () => {
- test("sample test", () => {
- let tokenizer = new Tokenizer();
- tokenizer.add(/^function\s*/, TokenType.FUNCTION );
- tokenizer.add(/^subroutine\s*/, TokenType.SUBROUTINE );
- tokenizer.add(/^if\s*/, TokenType.IF);
- tokenizer.add(/^do\s*/, TokenType.DO);
- tokenizer.add(/^end\s*/, TokenType.END );
- tokenizer.add(/^[0-9]+\s*/, TokenType.NUMBER); // number
- tokenizer.add(/^[a-zA-Z_]+[a-zA-Z0-9_]*\s*/, TokenType.VARIABLE ); // variable
- tokenizer.add(/^\(\s*/, TokenType.LEFT_PARENTESIS); // left parentesis
- tokenizer.add(/^\)\s*/, TokenType.RIGHT_PARENTESIS); // right parentesis
- tokenizer.add(/^,\s*/, TokenType.COMMA); // right parentesis
- tokenizer.add(/[+\-*\/]\s*/, TokenType.BINARY_OPERATOR); // right parentesis
-
- tokenizer.tokenize("function a( m, a10)\n 2 + 3\nend");
- let tokens = tokenizer.tokens;
- console.log(tokens);
+ test("get correct amount of tokens", () => {
+ const fortranTokenizer = constructFortranTokenizer();
+ fortranTokenizer.tokenize("function a( m, n)\n 2 + 3\nend");
+ let tokens = fortranTokenizer.tokens;
+ assert.equal(tokens.length, 11);
});
-});
\ No newline at end of file
+});
+
+function constructFortranTokenizer() {
+ const tokenizer = new Tokenizer();
+ tokenizer.add(/^function\s*/, TokenType.FUNCTION);
+ tokenizer.add(/^subroutine\s*/, TokenType.SUBROUTINE);
+ tokenizer.add(/^if\s*/, TokenType.IF);
+ tokenizer.add(/^do\s*/, TokenType.DO);
+ tokenizer.add(/^end\s*/, TokenType.END);
+ tokenizer.add(/^[0-9]+\s*/, TokenType.NUMBER); // number
+ tokenizer.add(/^[a-zA-Z_]+[a-zA-Z0-9_]*\s*/, TokenType.VARIABLE); // variable
+ tokenizer.add(/^\(\s*/, TokenType.LEFT_PARENTESIS); // left parentesis
+ tokenizer.add(/^\)\s*/, TokenType.RIGHT_PARENTESIS); // right parentesis
+ tokenizer.add(/^,\s*/, TokenType.COMMA); // comma separator
+ tokenizer.add(/[+\-*\/]\s*/, TokenType.BINARY_OPERATOR); // operators
+ return tokenizer;
+}
\ No newline at end of file