Merge pull request #23470 from geoand/#23001

Fix JBang defined class Dev UI linking
quarkusio · Feb 8, 2022 · b4f7fc0 · b4f7fc0
2 parents 8cc7f1d + 8f7ea3d
commit b4f7fc0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...t/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsoleProcessor.java b/...t/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsoleProcessor.java
@@ -964,7 +964,7 @@ private List<String> sourcePackagesForRoot(Path langPath) {
                 }
             }
             if (rootPackages.isEmpty()) {
-                return Collections.emptyList();
+                return List.of("");
             }
             List<String> result = new ArrayList<>(rootPackages.size());
             for (Path rootPackage : rootPackages) {

diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/main.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/main.html
@@ -167,7 +167,7 @@
                             if (sourceMap.hasOwnProperty(key)) {
                             var packages = sourceMap[key];
                             for (var i = 0; i < packages.length; i++) {
-                            if (className.startsWith(packages[i] + ".")) {
+                            if (className.startsWith(packages[i] + ".") || ((packages[i] === "") && (className.indexOf('.') == -1))) {
                             return key;
                             }
                             }
@@ -183,7 +183,7 @@
                             if (sourceLocationMap.hasOwnProperty(key)) {
                             var packages = sourceLocationMap[key];
                             for (var i = 0; i < packages.length; i++) {
-                            if (className.startsWith(packages[i] + ".")) {
+                            if (className.startsWith(packages[i] + ".") || ((packages[i] === "") && (className.indexOf('.') == -1))) {
                             return key;
                             }
                             }