Remove some redundant casts

Author: nojaf

server/src/codeActions.ts

@@ -630,7 +630,7 @@ let simpleAddMissingCases: codeActionExtractor = async ({
       .join("")
       .trim();
 
-    let filePath = utils.uriToNormalizedPath(file as utils.FileURI);
+    let filePath = utils.uriToNormalizedPath(file);
 
     let newSwitchCode = await utils.runAnalysisAfterSanityCheck(filePath, [
       "codemod",

server/src/incrementalCompilation.ts

@@ -587,8 +587,7 @@ async function compileContents(
               const change = Object.values(ca.codeAction.edit.changes)[0];
 
               ca.codeAction.edit.changes = {
-                [utils.pathToURI(entry.file.sourceFilePath) as utils.FileURI]:
-                  change,
+                [utils.pathToURI(entry.file.sourceFilePath)]: change,
               };
             }
           });
@@ -655,9 +654,7 @@ async function compileContents(
             }
           }
 
-          const fileUri = utils.pathToURI(
-            entry.file.sourceFilePath,
-          ) as utils.FileURI;
+          const fileUri = utils.pathToURI(entry.file.sourceFilePath);
 
           // Update filesWithDiagnostics to track this file
           // entry.project.rootPath is guaranteed to match a key in projectsFiles
@@ -671,10 +668,10 @@ async function compileContents(
             const allDiagnostics = [...res, ...compilerDiagnosticsForFile];
 
             if (allDiagnostics.length > 0) {
-              projectFile.filesWithDiagnostics.add(fileUri as utils.FileURI);
+              projectFile.filesWithDiagnostics.add(fileUri);
             } else {
               // Only remove if there are no diagnostics at all
-              projectFile.filesWithDiagnostics.delete(fileUri as utils.FileURI);
+              projectFile.filesWithDiagnostics.delete(fileUri);
             }
           }
 

server/src/server.ts

@@ -167,11 +167,12 @@ let sendUpdatedDiagnostics = async () => {
     codeActionsFromDiagnostics = codeActions;
 
     // diff
-    Object.keys(filesAndErrors).forEach((file) => {
-      const fileUri = file as utils.FileURI;
+    (
+      Object.entries(filesAndErrors) as Array<[utils.FileURI, p.Diagnostic[]]>
+    ).forEach(([fileUri, diagnostics]) => {
       let params: p.PublishDiagnosticsParams = {
         uri: fileUri,
-        diagnostics: filesAndErrors[fileUri],
+        diagnostics,
       };
       let notification: p.NotificationMessage = {
         jsonrpc: c.jsonrpcVersion,
@@ -216,8 +217,10 @@ let sendUpdatedDiagnostics = async () => {
 
       let errorCount = 0;
       let warningCount = 0;
-      for (const [fileUri, diags] of Object.entries(filesAndErrors)) {
-        const filePath = utils.uriToNormalizedPath(fileUri as utils.FileURI);
+      for (const [fileUri, diags] of Object.entries(filesAndErrors) as Array<
+        [utils.FileURI, p.Diagnostic[]]
+      >) {
+        const filePath = utils.uriToNormalizedPath(fileUri);
         if (filePath.startsWith(projectRootPath)) {
           for (const d of diags as v.Diagnostic[]) {
             if (d.severity === v.DiagnosticSeverity.Error) errorCount++;