fixes

Author: Frotty

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/RunMap.java

@@ -49,9 +49,7 @@ public class RunMap extends MapRequest {
     public RunMap(ConfigProvider configProvider, WFile workspaceRoot, Optional<String> wc3Path, Optional<File> map,
             List<String> compileArgs) {
         super(configProvider, map, compileArgs, workspaceRoot, wc3Path);
-        if (!configProvider.getConfig("safeRunmapTypecheck", "false").equals("true")) {
-            safeCompilation = SafetyLevel.QuickAndDirty;
-        }
+        safeCompilation = SafetyLevel.QuickAndDirty;
     }
 
     @Override

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/attributes/names/NameLinks.java

@@ -44,7 +44,7 @@ public static ImmutableMultimap<String, DefLink> calculate(ClassOrModuleOrModule
 
         if (c instanceof ClassDef) {
             WurstTypeClass classType = ((ClassDef) c).attrTypC();
-            addNamesFormSuperClass(result, classType, overrideCheckResults);
+            addNamesFromSuperClass(result, classType, overrideCheckResults);
             addNamesFromImplementedInterfaces(result, classType, overrideCheckResults);
         }
 
@@ -112,7 +112,7 @@ private static void addNamesFromImplementedInterfaces(Multimap<String, DefLink>
         }
     }
 
-    private static void addNamesFormSuperClass(Multimap<String, DefLink> result, WurstTypeClass c, Map<String, Map<FuncLink, OverrideCheckResult>> overrideCheckResults) {
+    private static void addNamesFromSuperClass(Multimap<String, DefLink> result, WurstTypeClass c, Map<String, Map<FuncLink, OverrideCheckResult>> overrideCheckResults) {
         @Nullable WurstTypeClass superClass = c.extendedClass();
         if (superClass != null) {
             addNewNameLinks(result, overrideCheckResults, superClass.nameLinks(), false);

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/validation/WurstValidator.java

@@ -2179,38 +2179,39 @@ private void checkForDuplicateNames(WScope scope) {
             if (nameLinks.size() <= 1) {
                 continue;
             }
-            List<FuncLink> funcs = Lists.newArrayList();
-            List<NameLink> other = Lists.newArrayList();
+            @Nullable List<FuncLink> funcs = null;
+            @Nullable List<NameLink> other = null;
             for (NameLink nl : nameLinks) {
                 if (nl.getDefinedIn() == scope) {
                     if (nl instanceof FuncLink) {
-                        funcs.add(((FuncLink) nl));
+                        if (funcs == null) {
+                            funcs = Lists.newArrayList();
+                        }
+                        FuncLink funcLink = (FuncLink) nl;
+                        for (FuncLink link : funcs) {
+                            if (!distinctFunctions(funcLink, link)) {
+                                funcLink.getDef().addError(
+                                    "Function already defined : " + Utils.printElementWithSource(Optional.of(link.getDef())));
+                                link.getDef().addError(
+                                    "Function already defined : " + Utils.printElementWithSource(Optional.of(funcLink.getDef())));
+                            }
+                        }
+
+                        funcs.add(funcLink);
                     } else {
+                        if (other == null) {
+                            other = Lists.newArrayList();
+                        }
                         other.add(nl);
                     }
                 }
             }
-            if (other.size() > 1) {
+            if (other != null && other.size() > 1) {
                 other.sort(Comparator.comparingInt(o -> o.getDef().attrSource().getLeftPos()));
                 NameLink l1 = other.get(0);
                 for (int j = 1; j < other.size(); j++) {
                     other.get(j).getDef().addError("An element with name " + name + " already exists: "
-                            + Utils.printElementWithSource(Optional.of(l1.getDef())));
-                }
-            }
-            if (funcs.size() <= 1) {
-                continue;
-            }
-            for (int i = 0; i < funcs.size() - 1; i++) {
-                FuncLink f1 = funcs.get(i);
-                for (int j = i + 1; j < funcs.size(); j++) {
-                    FuncLink f2 = funcs.get(j);
-                    if (!distinctFunctions(f1, f2)) {
-                        f1.getDef().addError(
-                                "Function already defined : " + Utils.printElementWithSource(Optional.of(f2.getDef())));
-                        f2.getDef().addError(
-                                "Function already defined : " + Utils.printElementWithSource(Optional.of(f1.getDef())));
-                    }
+                        + Utils.printElementWithSource(Optional.of(l1.getDef())));
                 }
             }
         }