Fix auto prefixes for single level namespaces

Author: jpmonettas

pom.xml

@@ -5,7 +5,7 @@
   <artifactId>clojure</artifactId>
   <name>clojure</name>
   <packaging>jar</packaging>
-  <version>1.13.0-alpha5</version>
+  <version>1.13.0-alpha6_1</version>
   <url>http://clojure.org/</url>
   <description>Clojure core environment and runtime library.</description>
 

src/jvm/clojure/storm/Utils.java

@@ -337,23 +337,38 @@ private static void collectFiles(File dir, List<File> collectedFiles) {
          }
      }
 
+     public static String getFileNameNoExtension(File file) {
+         String fileName = file.getName();
+         int dot = fileName.lastIndexOf('.');
+         return (dot == -1) ? fileName : fileName.substring(0, dot);
+    }
+
     public static Set<String> getSrcDirRootNamespaces(File dir) {        
         Set<String> namespaces = new HashSet<String>();
         List<File> allDirFiles = new ArrayList();
 
-        Pattern pattern = Pattern.compile(".+?" + dir.getName() + "/(.+?)/.*");
+        Pattern topLevelDirNsPattern = Pattern.compile(".+?" + dir.getName() + "/(.+?)/.*");
         collectFiles(dir, allDirFiles);
         for (File f : allDirFiles) {
             if (f.getName().endsWith(".clj") ||
                 f.getName().endsWith(".cljc")) {
 
-                Matcher matcher = pattern.matcher(f.getAbsolutePath().replace("\\","/"));
-                    
-                if (matcher.find() && matcher.groupCount() >= 1) {
-                    String rootDir = matcher.group(1);
+                String fileAbsPath = f.getAbsolutePath().replace("\\","/");
+
+                Pattern topLevelFileNsPattern = Pattern.compile(".+?" + dir.getName() + "/" + f.getName());
+
+                Matcher topLevelDirNsMatcher = topLevelDirNsPattern.matcher(fileAbsPath);
+                Matcher topLevelFileNsMatcher = topLevelFileNsPattern.matcher(fileAbsPath);
+
+                if (topLevelDirNsMatcher.find() && topLevelDirNsMatcher.groupCount() >= 1) {
+                    String rootDir = topLevelDirNsMatcher.group(1);
                     namespaces.add(Compiler.demunge(rootDir));
-                  }
                 }
+                if (topLevelFileNsMatcher.find()) {
+                    String nsFile = getFileNameNoExtension(f);
+                    namespaces.add(Compiler.demunge(nsFile));
+                }
+            }
         }
         return namespaces;
     }