Skip to content

Commit a6f535f

Browse files
authored
Support use of file paths in uri field of custom configuration (#10470)
1 parent edb810a commit a6f535f

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

Extension/src/LanguageServer/client.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2739,9 +2739,16 @@ export class DefaultClient implements Client {
27392739
const sanitized: SourceFileConfigurationItemAdapter[] = [];
27402740
configs.forEach(item => {
27412741
if (this.isSourceFileConfigurationItem(item, providerVersion)) {
2742-
this.configurationLogging.set(item.uri.toString(), JSON.stringify(item.configuration, null, 4));
2742+
let uri: string;
2743+
if (util.isString(item.uri) && !item.uri.startsWith("file://")) {
2744+
// If the uri field is a string, it may actually contain an fsPath.
2745+
uri = vscode.Uri.file(item.uri).toString();
2746+
} else {
2747+
uri = item.uri.toString();
2748+
}
2749+
this.configurationLogging.set(uri, JSON.stringify(item.configuration, null, 4));
27432750
if (settings.loggingLevel === "Debug") {
2744-
out.appendLine(` uri: ${item.uri.toString()}`);
2751+
out.appendLine(` uri: ${uri}`);
27452752
out.appendLine(` config: ${JSON.stringify(item.configuration, null, 2)}`);
27462753
}
27472754
if (item.configuration.includePath.some(path => path.endsWith('**'))) {
@@ -2766,7 +2773,7 @@ export class DefaultClient implements Client {
27662773
}
27672774
}
27682775
sanitized.push({
2769-
uri: item.uri.toString(),
2776+
uri,
27702777
configuration: itemConfig
27712778
});
27722779
} else {

0 commit comments

Comments
 (0)