Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
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