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