Automatically teardown settings for diagnotics tests (#1398)

* Automatically teardown settings for diagnotics tests

Moved these tests over to the fixture to make teardown less error

* Fix failing tests

* Revert removed suite

* Revert

Author: award999

src/DiagnosticsManager.ts

@@ -59,7 +59,7 @@ export class DiagnosticsManager implements vscode.Disposable {
 
     private diagnosticCollection: vscode.DiagnosticCollection =
         vscode.languages.createDiagnosticCollection("swift");
-    private allDiagnostics: Map<string, vscode.Diagnostic[]> = new Map();
+    allDiagnostics: Map<string, vscode.Diagnostic[]> = new Map();
     private disposed = false;
 
     constructor(context: WorkspaceContext) {

src/configuration.ts

@@ -38,6 +38,7 @@ export type DiagnosticCollectionOptions =
     | "keepSwiftc"
     | "keepSourceKit"
     | "keepAll";
+export type DiagnosticStyle = "default" | "llvm" | "swift";
 
 /** sourcekit-lsp configuration */
 export interface LSPConfiguration {
@@ -369,8 +370,10 @@ const configuration = {
             .get<DiagnosticCollectionOptions>("diagnosticsCollection", "keepSourceKit");
     },
     /** set the -diagnostic-style option when running `swift` tasks */
-    get diagnosticsStyle(): "default" | "llvm" | "swift" {
-        return vscode.workspace.getConfiguration("swift").get("diagnosticsStyle", "llvm");
+    get diagnosticsStyle(): DiagnosticStyle {
+        return vscode.workspace
+            .getConfiguration("swift")
+            .get<DiagnosticStyle>("diagnosticsStyle", "llvm");
     },
     /** where to show the build progress for the running task */
     get showBuildStatus(): ShowBuildStatusOptions {