fluencelabs/aqua-vscode
1
0
Fork 0
mirror of https://github.com/fluencelabs/aqua-vscode synced 2025-04-24 16:12:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix null settings (#45)

Browse Source
This commit is contained in:
Dima 2023-08-24 13:19:43 +02:00 committed by GitHub
parent 906e40b273
commit f1ed3059f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/server.ts
View File

@ -49,7 +49,7 @@ const defaultSettings: Settings = { imports: [], enableLegacyAutoImportSearch: f
let globalSettings: Settings = defaultSettings; let globalSettings: Settings = defaultSettings;
// Cache the settings of all open documents // Cache the settings of all open documents
const documentSettings: Map<string, Thenable<Settings>> = new Map(); const documentSettings: Map<string, Settings> = new Map();
const allLocations: Map<string, TokenLink[]> = new Map(); const allLocations: Map<string, TokenLink[]> = new Map();
@ -98,18 +98,18 @@ connection.onDidChangeConfiguration((change) => {
documents.all().forEach(validateDocument); documents.all().forEach(validateDocument);
}); });
function getDocumentSettings(resource: string): Thenable<Settings> { async function getDocumentSettings(resource: string): Promise<Settings> {
if (!hasConfigurationCapability) { if (!hasConfigurationCapability) {
return Promise.resolve(globalSettings); return Promise.resolve(globalSettings);
} }
let result = documentSettings.get(resource); let result = await documentSettings.get(resource);
if (!result) { if (!result) {
result = connection.workspace.getConfiguration({ result = await connection.workspace.getConfiguration({
scopeUri: resource, scopeUri: resource,
section: 'aquaSettings', section: 'aquaSettings',
}); });
if (!result) { if (!result) {
result = Promise.resolve(defaultSettings); result = defaultSettings;
} }
documentSettings.set(resource, result); documentSettings.set(resource, result);
} }