Skip to content

Commit de97cf5

Browse files
committed
Show PSSA load exception
1 parent 33a83e4 commit de97cf5

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

src/PowerShellEditorServices/Services/Analysis/AnalysisService.cs

+2-5
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ internal static string GetUniqueIdFromDiagnostic(Diagnostic diagnostic)
8888

8989
private readonly WorkspaceService _workspaceService;
9090

91-
private readonly int _analysisDelayMillis;
91+
private readonly int _analysisDelayMillis = 750;
9292

93-
private readonly ConcurrentDictionary<ScriptFile, CorrectionTableEntry> _mostRecentCorrectionsByFile;
93+
private readonly ConcurrentDictionary<ScriptFile, CorrectionTableEntry> _mostRecentCorrectionsByFile = new();
9494

9595
private Lazy<PssaCmdletAnalysisEngine> _analysisEngineLazy;
9696

@@ -112,11 +112,8 @@ public AnalysisService(
112112
_languageServer = languageServer;
113113
_configurationService = configurationService;
114114
_workspaceService = workspaceService;
115-
_analysisDelayMillis = 750;
116-
_mostRecentCorrectionsByFile = new ConcurrentDictionary<ScriptFile, CorrectionTableEntry>();
117115
_analysisEngineLazy = new Lazy<PssaCmdletAnalysisEngine>(InstantiateAnalysisEngine);
118116
_pssaModulePath = Path.Combine(hostInfo.BundledModulePath, "PSScriptAnalyzer");
119-
_pssaSettingsFilePath = null;
120117
}
121118

122119
/// <summary>

src/PowerShellEditorServices/Services/Analysis/PssaCmdletAnalysisEngine.cs

+6-13
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,12 @@ public PssaCmdletAnalysisEngine Build(string pssaModulePath)
7171
// RunspacePool takes care of queuing commands for us so we do not
7272
// need to worry about executing concurrent commands
7373
ILogger logger = _loggerFactory.CreateLogger<PssaCmdletAnalysisEngine>();
74-
try
75-
{
76-
logger.LogDebug("Creating PSScriptAnalyzer runspace with module at: '{Path}'", pssaModulePath);
77-
RunspacePool pssaRunspacePool = CreatePssaRunspacePool(pssaModulePath);
78-
PssaCmdletAnalysisEngine cmdletAnalysisEngine = new(logger, pssaRunspacePool, _rules, _settingsParameter);
79-
cmdletAnalysisEngine.LogAvailablePssaFeatures();
80-
return cmdletAnalysisEngine;
81-
}
82-
catch (Exception ex)
83-
{
84-
logger.LogError(ex, "Unable to load PSScriptAnalyzer, disabling script analysis!");
85-
return null;
86-
}
74+
75+
logger.LogDebug("Creating PSScriptAnalyzer runspace with module at: '{Path}'", pssaModulePath);
76+
RunspacePool pssaRunspacePool = CreatePssaRunspacePool(pssaModulePath);
77+
PssaCmdletAnalysisEngine cmdletAnalysisEngine = new(logger, pssaRunspacePool, _rules, _settingsParameter);
78+
cmdletAnalysisEngine.LogAvailablePssaFeatures();
79+
return cmdletAnalysisEngine;
8780
}
8881
}
8982

0 commit comments

Comments
 (0)