feat(#114): check package

objectionary · Jan 2, 2025 · e21ed5e · e21ed5e
1 parent 9347faa
commit e21ed5e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/src/main/java/org/eolang/lints/errors/LtObjectIsNotUnique.java b/src/main/java/org/eolang/lints/errors/LtObjectIsNotUnique.java
@@ -51,11 +51,12 @@ public Collection<Defect> defects(final Map<String, XML> pkg) {
             xmir -> {
                 final String src = xmir.xpath("/program/@name").get(0);
                 final String name = xmir.xpath("/program/objects/o[1]/@name").get(0);
+                final String pack = LtObjectIsNotUnique.packageName(xmir);
                 pkg.values().forEach(
                     oth -> {
                         if (!Objects.equals(oth, xmir)) {
                             final String other = oth.xpath("/program/objects/o[1]/@name").get(0);
-                            if (name.equals(other)) {
+                            if (name.equals(other) && LtObjectIsNotUnique.packageName(oth).equals(pack)) {
                                 defects.add(
                                     new Defect.Default(
                                         this.name(),
@@ -81,6 +82,16 @@ public Collection<Defect> defects(final Map<String, XML> pkg) {
         return defects;
     }
 
+    private static String packageName(final XML xmir) {
+        final String name;
+        if (xmir.nodes("/program/metas/meta[head='package']").size() == 1) {
+            name = xmir.xpath("/program/metas/meta[head='package']/tail/text()").get(0);
+        } else {
+            name = "";
+        }
+        return name;
+    }
+
     @Override
     public String motive() throws Exception {
         throw new UnsupportedOperationException("#motive()");

diff --git a/src/test/java/org/eolang/lints/errors/LtObjectIsNotUniqueTest.java b/src/test/java/org/eolang/lints/errors/LtObjectIsNotUniqueTest.java
@@ -72,6 +72,20 @@ void allowsAllUnique() throws Exception {
         );
     }
 
+    @Test
+    void allowsNonUniqueInDifferentPackages() throws Exception {
+        MatcherAssert.assertThat(
+            "Defects aren't empty, but they should",
+            new LtObjectIsNotUnique().defects(
+                new MapOf<String, XML>(
+                    new MapEntry<>("foo", LtObjectIsNotUniqueTest.xmir("foo")),
+                    new MapEntry<>("bar", LtObjectIsNotUniqueTest.xmir("foo-packaged"))
+                )
+            ),
+            Matchers.emptyIterable()
+        );
+    }
+
     private static XML xmir(final String name) throws Exception {
         return new EoSyntax(
             name,

diff --git a/src/test/resources/org/eolang/lints/errors/object-is-not-unique/foo-packaged.eo b/src/test/resources/org/eolang/lints/errors/object-is-not-unique/foo-packaged.eo
@@ -0,0 +1,4 @@
++package utils
+
+# Foo.
+[] > foo