Treat members that could be static but aren't as errors (and fix)

Author: andyleejordan

.editorconfig

@@ -15,6 +15,8 @@ csharp_space_after_keywords_in_control_flow_statements = true
 
 # CA2007: Do not directly await a Task
 dotnet_diagnostic.CA2007.severity = error
+# CA1822: Mark members as static
+dotnet_diagnostic.CA1822.severity = error
 
 [*.{json}]
 indent_size = 2

src/PowerShellEditorServices.Hosting/EditorServicesLoader.cs

@@ -226,7 +226,7 @@ public void Dispose()
             // This is not high priority, since the PSES process shouldn't be reused
         }
 
-        private void LoadEditorServices()
+        private static void LoadEditorServices()
         {
             // This must be in its own method, since the actual load happens when the calling method is called
             // The call within this method is therefore a total no-op
@@ -317,7 +317,7 @@ private void LogHostInformation()
             LogOperatingSystemDetails();
         }
 
-        private string GetPSOutputEncoding()
+        private static string GetPSOutputEncoding()
         {
             using (var pwsh = SMA.PowerShell.Create())
             {
@@ -346,7 +346,7 @@ private void LogOperatingSystemDetails()
 ");
         }
 
-        private string GetOSArchitecture()
+        private static string GetOSArchitecture()
         {
 #if CoreCLR
             if (Environment.OSVersion.Platform != PlatformID.Win32NT)

src/PowerShellEditorServices.VSCode/CustomViews/HtmlContentView.cs

@@ -40,8 +40,8 @@ public Task SetContentAsync(HtmlContent htmlContent) =>
                     HtmlContent = new HtmlContent()
                     {
                         BodyContent = htmlContent.BodyContent,
-                        JavaScriptPaths = this.GetUriPaths(htmlContent.JavaScriptPaths),
-                        StyleSheetPaths = this.GetUriPaths(htmlContent.StyleSheetPaths)
+                        JavaScriptPaths = HtmlContentView.GetUriPaths(htmlContent.JavaScriptPaths),
+                        StyleSheetPaths = HtmlContentView.GetUriPaths(htmlContent.StyleSheetPaths)
                     }
                 }
             );
@@ -56,7 +56,7 @@ public Task AppendContentAsync(string appendedHtmlBodyContent) =>
                 }
             );
 
-        private string[] GetUriPaths(string[] filePaths)
+        private static string[] GetUriPaths(string[] filePaths)
         {
             return
                 filePaths?

src/PowerShellEditorServices/Extensions/Api/EditorExtensionServiceProvider.cs

@@ -156,7 +156,7 @@ public object GetService(Type serviceType)
         /// In .NET Framework, this returns null.
         /// </summary>
         /// <returns>The assembly load context used for loading PSES, or null in .NET Framework.</returns>
-        public object GetPsesAssemblyLoadContext()
+        public static object GetPsesAssemblyLoadContext()
         {
             if (!VersionUtils.IsNetCore)
             {
@@ -172,7 +172,7 @@ public object GetPsesAssemblyLoadContext()
         /// </summary>
         /// <param name="assemblyPath">The absolute path of the assembly to load.</param>
         /// <returns>The loaded assembly object.</returns>
-        public Assembly LoadAssemblyInPsesLoadContext(string assemblyPath)
+        public static Assembly LoadAssemblyInPsesLoadContext(string assemblyPath)
         {
             if (!VersionUtils.IsNetCore)
             {

src/PowerShellEditorServices/Extensions/Api/WorkspaceService.cs

@@ -147,7 +147,7 @@ public IReadOnlyList<IEditorScriptFile> GetOpenedFiles()
             return files.AsReadOnly();
         }
 
-        private IEditorScriptFile GetEditorFileFromScriptFile(ScriptFile file)
+        private static IEditorScriptFile GetEditorFileFromScriptFile(ScriptFile file)
         {
             return new EditorScriptFile(file);
         }

src/PowerShellEditorServices/Services/Analysis/PssaCmdletAnalysisEngine.cs

@@ -362,7 +362,7 @@ private PowerShellResult InvokePowerShell(PSCommand command)
         /// </summary>
         /// <param name="powershell">The PowerShell instance to execute.</param>
         /// <returns>The output of PowerShell execution.</returns>
-        private Collection<PSObject> InvokePowerShellWithModulePathPreservation(System.Management.Automation.PowerShell powershell)
+        private static Collection<PSObject> InvokePowerShellWithModulePathPreservation(System.Management.Automation.PowerShell powershell)
         {
             using (PSModulePathPreserver.Take())
             {

src/PowerShellEditorServices/Services/CodeLens/PesterCodeLensProvider.cs

@@ -42,7 +42,7 @@ public PesterCodeLensProvider(ConfigurationService configurationService)
         /// <param name="pesterSymbol">The Pester symbol to get CodeLenses for.</param>
         /// <param name="scriptFile">The script file the Pester symbol comes from.</param>
         /// <returns>All CodeLenses for the given Pester symbol.</returns>
-        private CodeLens[] GetPesterLens(PesterSymbolReference pesterSymbol, ScriptFile scriptFile)
+        private static CodeLens[] GetPesterLens(PesterSymbolReference pesterSymbol, ScriptFile scriptFile)
         {
             string word = pesterSymbol.Command == PesterCommandType.It ? "test" : "tests";
             var codeLensResults = new CodeLens[]

src/PowerShellEditorServices/Services/CodeLens/ReferencesCodeLensProvider.cs

@@ -86,7 +86,7 @@ public CodeLens ResolveCodeLens(CodeLens codeLens, ScriptFile scriptFile)
             ScriptFile[] references = _workspaceService.ExpandScriptReferences(
                 scriptFile);
 
-            SymbolReference foundSymbol = _symbolsService.FindFunctionDefinitionAtLocation(
+            SymbolReference foundSymbol = SymbolsService.FindFunctionDefinitionAtLocation(
                 scriptFile,
                 codeLens.Range.Start.Line + 1,
                 codeLens.Range.Start.Character + 1);

src/PowerShellEditorServices/Services/DebugAdapter/DebugService.cs

@@ -856,7 +856,7 @@ private async Task FetchStackFramesAsync(string scriptNameOverride)
             }
         }
 
-        private string TrimScriptListingLine(PSObject scriptLineObj, ref int prefixLength)
+        private static string TrimScriptListingLine(PSObject scriptLineObj, ref int prefixLength)
         {
             string scriptLine = scriptLineObj.ToString();
 
@@ -908,7 +908,7 @@ await this.powerShellContext.ExecuteCommandAsync<PSObject>(
                         string.Join(
                             Environment.NewLine,
                             scriptListingLines
-                                .Select(o => this.TrimScriptListingLine(o, ref linePrefixLength))
+                                .Select(o => DebugService.TrimScriptListingLine(o, ref linePrefixLength))
                                 .Where(s => s != null));
 
                     this.temporaryScriptListingPath =

src/PowerShellEditorServices/Services/PowerShellContext/Console/ChoicePromptHandler.cs

@@ -144,7 +144,7 @@ public Task<int> PromptForChoiceAsync(
                                 throw new TaskCanceledException(task);
                             }
 
-                            return this.GetSingleResult(task.GetAwaiter().GetResult());
+                            return ChoicePromptHandler.GetSingleResult(task.GetAwaiter().GetResult());
                         }));
         }
 
@@ -335,7 +335,7 @@ protected override void OnPromptCancelled()
 
         #region Private Methods
 
-        private int GetSingleResult(int[] choiceArray)
+        private static int GetSingleResult(int[] choiceArray)
         {
             return
                 choiceArray != null