Skip to content

Make AnalysisService use the latest version of PSScriptAnalyzer #677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jun 13, 2018
Merged

Make AnalysisService use the latest version of PSScriptAnalyzer #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e83b1ea
Add minimum version to PSSA import, refactor redundant code
Jun 4, 2018
1d3f874
Make AnalysisService constructor private
Jun 4, 2018
cb2fd46
Add null exception defense for AnalysisService
Jun 4, 2018
3a02da6
Use Get-Module to document PSScriptAnalyzer features
rjmholt Jun 5, 2018
8fb6350
Fix XML comments
rjmholt Jun 5, 2018
cf50bfd
Use old ImportPSModule API for older PowerShell versions
rjmholt Jun 5, 2018
50974a8
Ensure older PowerShells get a good version of PSSA
rjmholt Jun 5, 2018
bfd9f85
Revert to old PSScriptAnalyzer import, with cached result
rjmholt Jun 5, 2018
5e3958e
Add some further comments to document
rjmholt Jun 5, 2018
73d6f27
Address @tylerl0706's feedback, convert logging to string builder, im…
Jun 6, 2018
2ed90f8
Add XML comment to dispose method
Jun 6, 2018
7fce107
Use latest PSScriptAnalyzer version rather than hunt for minimum version
Jun 7, 2018
0b1d01a
Put _ on private disposedvalue variable
Jun 8, 2018
a6d8b3c
Handle exceptions more formally, update comments, improve disposal
Jun 11, 2018
72ce1f4
Merge branch 'master' into pssa-module-version-check-1298
rjmholt Jun 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ protected async Task HandleDidChangeConfigurationNotification(
bool oldScriptAnalysisEnabled =
this.currentSettings.ScriptAnalysis.Enable.HasValue ? this.currentSettings.ScriptAnalysis.Enable.Value : false;
string oldScriptAnalysisSettingsPath =
this.currentSettings.ScriptAnalysis.SettingsPath;
this.currentSettings.ScriptAnalysis?.SettingsPath;

this.currentSettings.Update(
configChangeParams.Settings.Powershell,
Expand Down Expand Up @@ -604,12 +604,15 @@ protected async Task HandleDidChangeConfigurationNotification(
string newSettingsPath = this.currentSettings.ScriptAnalysis.SettingsPath;
if (!string.Equals(oldScriptAnalysisSettingsPath, newSettingsPath, StringComparison.OrdinalIgnoreCase))
{
this.editorSession.AnalysisService.SettingsPath = newSettingsPath;
settingsPathChanged = true;
if (this.editorSession.AnalysisService != null)
{
this.editorSession.AnalysisService.SettingsPath = newSettingsPath;
settingsPathChanged = true;
}
}

// If script analysis settings have changed we need to clear & possibly update the current diagnostic records.
if ((oldScriptAnalysisEnabled != this.currentSettings.ScriptAnalysis.Enable) || settingsPathChanged)
if ((oldScriptAnalysisEnabled != this.currentSettings.ScriptAnalysis?.Enable) || settingsPathChanged)
{
// If the user just turned off script analysis or changed the settings path, send a diagnostics
// event to clear the analysis markers that they already have.
Expand Down Expand Up @@ -1443,7 +1446,7 @@ private Task RunScriptDiagnostics(
DelayThenInvokeDiagnostics(
750,
filesToAnalyze,
this.currentSettings.ScriptAnalysis.Enable.Value,
this.currentSettings.ScriptAnalysis?.Enable.Value ?? false,
this.codeActionsPerFile,
editorSession,
eventSender,
Expand Down
Loading