Skip to content

Minor release - version 2.1.2 #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 24 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f4417f9
map Fortran subroutine to vscode Function kind
letmaik Jun 22, 2019
b3a13de
Bump lodash from 4.17.11 to 4.17.14
dependabot[bot] Jul 12, 2019
fbcb0dd
Bump mixin-deep from 1.3.1 to 1.3.2
dependabot[bot] Aug 28, 2019
6d26c9c
Fix blocking due to very slow regex execution in "parseFunction"
hansec Dec 4, 2019
e130700
Add support for disabling Hover, Completion and Symbol providers
hansec Dec 4, 2019
3480f65
Added select rank
implicitall Jan 24, 2020
b0e0400
Merge pull request #1 from andrewbest/andrewbest-select-rank
implicitall Jan 24, 2020
4e89a1c
Fix symbols in VSCode ^1.40
pedro-ricardo Feb 24, 2020
2f2f8e8
Update package.json
pedro-ricardo Feb 24, 2020
80edd63
Fix autoclosing pair for array constructor
pedro-ricardo Feb 24, 2020
bf52b35
Merge pull request #141 from letmaik/patch-1
pedro-ricardo Feb 24, 2020
9da7fa4
Merge pull request #151 from hansec/slow_fun_regex
pedro-ricardo Feb 24, 2020
8f98a62
Merge branch 'hotfix/symbol-provider' into release/2.1.2
pedro-ricardo Feb 24, 2020
e40ddad
Merge pull request #152 from hansec/toggle_HovSymComp
pedro-ricardo Feb 24, 2020
9ce44f6
Fix minor error using
pedro-ricardo Feb 24, 2020
4755265
Merge pull request #144 from krvajal/dependabot/npm_and_yarn/lodash-4…
pedro-ricardo Feb 24, 2020
06eb066
Merge pull request #146 from krvajal/dependabot/npm_and_yarn/mixin-de…
pedro-ricardo Feb 24, 2020
a39662d
Bump handlebars from 4.0.11 to 4.7.3
dependabot[bot] Feb 24, 2020
4c0b518
Merge branch 'release/2.1.2' into dependabot/npm_and_yarn/handlebars-…
pedro-ricardo Feb 24, 2020
6bf3b7d
Merge pull request #164 from krvajal/dependabot/npm_and_yarn/handleba…
pedro-ricardo Feb 24, 2020
f9d2abe
Merge pull request #157 from andrewbest/master
pedro-ricardo Feb 24, 2020
c79dc8c
Revert "Select rank"
pedro-ricardo Feb 25, 2020
6e14c58
Revert "Select rank"
pedro-ricardo Feb 25, 2020
1fcefd5
Fix select highlight after & operator (#165)
pedro-ricardo Feb 27, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion language-configuration.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
{
"open": "(/",
"close": "/)"
"close": "/"
}
],
"surroundingPairs": [
Expand Down
178 changes: 39 additions & 139 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 16 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "linter-gfortran",
"displayName": "Modern Fortran",
"description": "Modern Fortran language support, including syntax highlighting and error detection.",
"version": "2.1.1",
"version": "2.1.2",
"publisher": "krvajalm",
"engines": {
"vscode": "^1.30.x"
Expand Down Expand Up @@ -120,6 +120,11 @@
],
"description": "Specify additional options to use when calling the gfortran compiler"
},
"fortran.provideSymbols": {
"type": "boolean",
"default": true,
"description": "Enables or disables symbol functionality (disable if using 'Fortran IntelliSense')"
},
"fortran.symbols": {
"type": [
"array"
Expand All @@ -133,6 +138,16 @@
],
"description": "Specify what kind of symbols should be shown by the symbols' provider"
},
"fortran.provideHover": {
"type": "boolean",
"default": true,
"description": "Enables or hover functionality (disable if using 'Fortran IntelliSense')"
},
"fortran.provideCompletion": {
"type": "boolean",
"default": true,
"description": "Enables or disables completion functionality (disable if using 'Fortran IntelliSense')"
},
"fortran.preferredCase": {
"type": "string",
"default": "lowercase",
Expand Down
38 changes: 24 additions & 14 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ import { FortranLangServer, checkForLangServer } from './lang-server'


export function activate(context: vscode.ExtensionContext) {
let hoverProvider = new FortranHoverProvider()
let completionProvider = new FortranCompletionProvider()
let symbolProvider = new FortranDocumentSymbolProvider()

const extensionConfig = vscode.workspace.getConfiguration(EXTENSION_ID)

Expand All @@ -23,17 +20,30 @@ export function activate(context: vscode.ExtensionContext) {
vscode.languages.registerCodeActionsProvider(FORTRAN_FREE_FORM_ID, linter)
}

vscode.languages.registerCompletionItemProvider(
FORTRAN_FREE_FORM_ID,
completionProvider
)
vscode.languages.registerHoverProvider(FORTRAN_FREE_FORM_ID, hoverProvider)

vscode.languages.registerDocumentSymbolProvider(
FORTRAN_FREE_FORM_ID,
symbolProvider
)

if (extensionConfig.get('provideCompletion', true)) {
let completionProvider = new FortranCompletionProvider()
vscode.languages.registerCompletionItemProvider(
FORTRAN_FREE_FORM_ID,
completionProvider
)
}

if (extensionConfig.get('provideHover', true)) {
let hoverProvider = new FortranHoverProvider()
vscode.languages.registerHoverProvider(
FORTRAN_FREE_FORM_ID,
hoverProvider
)
}

if (extensionConfig.get('provideSymbols', true)) {
let symbolProvider = new FortranDocumentSymbolProvider()
vscode.languages.registerDocumentSymbolProvider(
FORTRAN_FREE_FORM_ID,
symbolProvider
)
}

if (checkForLangServer(extensionConfig)) {

const langServer = new FortranLangServer(context, extensionConfig)
Expand Down
Loading