Skip to content

Commit 7fadc99

Browse files
authored
Merge pull request #699 from fortran-lang/gnikit/issue698
bug: internal vscode module output
2 parents e38983e + 641d103 commit 7fadc99

File tree

4 files changed

+7
-40
lines changed

4 files changed

+7
-40
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
7070

7171
### Fixed
7272

73+
- Fixed bug where the linter's internal cache directory would not always exist
74+
([#698](https://github.com/fortran-lang/vscode-fortran-support/issues/698))
7375
- Fixed bugs in relative path resolution for `fortls`
7476
([#693](https://github.com/fortran-lang/vscode-fortran-support/issues/693))
7577
- Fixed issues with linter unittests running asynchronously

src/extension.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ export async function activate(context: vscode.ExtensionContext) {
4747
})
4848
);
4949
// Linter is always activated but will only lint if compiler !== Disabled
50-
const linterCache = path.join(context.storageUri.fsPath);
50+
const linterCache = path.join(context.storageUri.fsPath, 'include');
51+
await vscode.workspace.fs.createDirectory(vscode.Uri.parse(linterCache));
5152
const linter = new FortranLintingProvider(logger, linterCache);
5253
context.subscriptions.push(...(await linter.activate()));
5354
vscode.languages.registerCodeActionsProvider(FortranDocumentSelector(), linter);

test/integration/lsp-client.test.ts

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -47,42 +47,3 @@ suite('Language Server integration tests', () => {
4747
strictEqual(JSON.stringify(ref), JSON.stringify(res));
4848
});
4949
});
50-
51-
suite('Language Server integration tests', () => {
52-
const server = new FortlsClient(logger);
53-
const fileUri = vscode.Uri.file(path.resolve(__dirname, '../../../test/fortran/sample.f90'));
54-
55-
suiteSetup(async () => {
56-
const doc = await vscode.workspace.openTextDocument(fileUri);
57-
await vscode.window.showTextDocument(doc);
58-
await server.activate();
59-
});
60-
61-
test('Restart the Language Server', async () => {
62-
await server['restartLS']();
63-
await delay(6000); // wait for server to initialize
64-
65-
const ref = {
66-
capabilities: {
67-
completionProvider: {
68-
resolveProvider: false,
69-
triggerCharacters: ['%'],
70-
},
71-
definitionProvider: true,
72-
documentSymbolProvider: true,
73-
referencesProvider: true,
74-
hoverProvider: true,
75-
implementationProvider: true,
76-
renameProvider: true,
77-
workspaceSymbolProvider: true,
78-
textDocumentSync: 2,
79-
signatureHelpProvider: {
80-
triggerCharacters: ['(', ','],
81-
},
82-
codeActionProvider: true,
83-
},
84-
};
85-
const res = server['client']?.initializeResult;
86-
strictEqual(JSON.stringify(ref), JSON.stringify(res));
87-
});
88-
});

updates/RELEASE_NOTES-unreleased.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,3 +207,6 @@ which is slower but does not suffer from this issue.
207207
The cache used by the linter should help mitigate any performance issues.
208208

209209
## 🐛 Bug Fixes 🐛
210+
211+
- Fixed bug where the linter's internal cache directory would not always exist
212+
([#698](https://github.com/fortran-lang/vscode-fortran-support/issues/698))

0 commit comments

Comments
 (0)