From 563b220cb9243ea19a49cfe82cf9fcadda79b600 Mon Sep 17 00:00:00 2001
From: Jeremy Rifkin <51220084+jeremy-rifkin@users.noreply.github.com>
Date: Wed, 22 Feb 2023 17:45:55 -0500
Subject: Type work for some handlers and stuff related to the compiler-finder
 (#4752)

---
 lib/compilers/java.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'lib/compilers/java.ts')

diff --git a/lib/compilers/java.ts b/lib/compilers/java.ts
index 8f2a3e91a..cf665646e 100644
--- a/lib/compilers/java.ts
+++ b/lib/compilers/java.ts
@@ -27,7 +27,7 @@ import path from 'path';
 import fs from 'fs-extra';
 
 import {ParsedAsmResult, ParsedAsmResultLine} from '../../types/asmresult/asmresult.interfaces';
-import {CompilerInfo} from '../../types/compiler.interfaces';
+import {PreliminaryCompilerInfo} from '../../types/compiler.interfaces';
 import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces';
 import {unwrap} from '../assert';
 import {BaseCompiler} from '../base-compiler';
@@ -44,12 +44,15 @@ export class JavaCompiler extends BaseCompiler {
     javaRuntime: string;
     mainRegex: RegExp;
 
-    constructor(compilerInfo: CompilerInfo, env) {
-        // Default is to disable all "cosmetic" filters
-        if (!compilerInfo.disabledFilters) {
-            compilerInfo.disabledFilters = ['labels', 'directives', 'commentOnly', 'trim'];
-        }
-        super(compilerInfo, env);
+    constructor(compilerInfo: PreliminaryCompilerInfo, env) {
+        super(
+            {
+                // Default is to disable all "cosmetic" filters
+                disabledFilters: ['labels', 'directives', 'commentOnly', 'trim'],
+                ...compilerInfo,
+            },
+            env,
+        );
         this.javaRuntime = this.compilerProps<string>(`compiler.${this.compiler.id}.runtime`);
         this.mainRegex = /public static ?(.*?) void main\(java\.lang\.String\[]\)/;
     }
-- 
cgit v1.2.3