Skip to content

Commit e5a5557

Browse files
Fix diagnostics not showing in untitled files and now also show CodeLens (#1098)
* Fix diagnostics for untitled files * enable CodeLens for untitled files
1 parent 59f0ecb commit e5a5557

File tree

2 files changed

+6
-18
lines changed

2 files changed

+6
-18
lines changed

src/PowerShellEditorServices/Services/Analysis/AnalysisService.cs

+1-9
Original file line numberDiff line numberDiff line change
@@ -867,19 +867,11 @@ private void PublishScriptDiagnostics(
867867
fileLock.Release();
868868
}
869869

870-
871-
var uriBuilder = new UriBuilder
872-
{
873-
Scheme = Uri.UriSchemeFile,
874-
Path = scriptFile.FilePath,
875-
Host = string.Empty,
876-
};
877-
878870
// Always send syntax and semantic errors. We want to
879871
// make sure no out-of-date markers are being displayed.
880872
_languageServer.Document.PublishDiagnostics(new PublishDiagnosticsParams()
881873
{
882-
Uri = uriBuilder.Uri,
874+
Uri = new Uri(scriptFile.DocumentUri),
883875
Diagnostics = new Container<Diagnostic>(diagnostics),
884876
});
885877
}

src/PowerShellEditorServices/Services/Symbols/ScriptDocumentSymbolProvider.cs

+5-9
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,11 @@ public class ScriptDocumentSymbolProvider : IDocumentSymbolProvider
2020
IEnumerable<SymbolReference> IDocumentSymbolProvider.ProvideDocumentSymbols(
2121
ScriptFile scriptFile)
2222
{
23-
if (scriptFile != null &&
24-
scriptFile.FilePath != null &&
25-
(scriptFile.FilePath.EndsWith(".ps1", StringComparison.OrdinalIgnoreCase) ||
26-
scriptFile.FilePath.EndsWith(".psm1", StringComparison.OrdinalIgnoreCase)))
27-
{
28-
return FindSymbolsInDocument(scriptFile.ScriptAst);
29-
}
30-
31-
return Enumerable.Empty<SymbolReference>();
23+
// If we have an AST, then we know it's a PowerShell file
24+
// so lets try to find symbols in the document.
25+
return scriptFile?.ScriptAst != null
26+
? FindSymbolsInDocument(scriptFile.ScriptAst)
27+
: Enumerable.Empty<SymbolReference>();
3228
}
3329

3430
/// <summary>

0 commit comments

Comments
 (0)