feat(#117): clean

Author: h1alexbel

src/main/java/org/eolang/lints/errors/LtAtomIsNotUnique.java

@@ -26,23 +26,18 @@
 import com.jcabi.xml.XML;
 import com.jcabi.xml.XSL;
 import com.jcabi.xml.XSLDocument;
-import java.io.IOException;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-import org.cactoos.io.InputOf;
 import org.cactoos.io.ResourceOf;
 import org.cactoos.io.UncheckedInput;
 import org.cactoos.list.ListOf;
-import org.cactoos.scalar.IoChecked;
-import org.cactoos.scalar.Unchecked;
 import org.cactoos.text.TextOf;
 import org.cactoos.text.UncheckedText;
 import org.eolang.lints.Defect;
@@ -51,8 +46,8 @@
 
 /**
  * All FQNs that have `@atom` in the entire scope must be unique.
- * This lint already expects the presence of `@fqn` attribute for each atom `o`
- * in XMIR.
+ * This lint firstly transforms the original XMIR into XMIR that contains `@fqn`
+ * attributes for each atom `o`, and then lints it.
  *
  * @since 0.0.31
  */
@@ -61,7 +56,7 @@ public final class LtAtomIsNotUnique implements Lint<Map<String, XML>> {
     /**
      * Stylesheet for adding `@fqn` attribute for atoms.
      */
-    private final XSL fqns;
+    private final XSL pre;
 
     /**
      * Ctor.
@@ -82,7 +77,7 @@ public LtAtomIsNotUnique() {
      * @param sheet Sheet
      */
     public LtAtomIsNotUnique(final XSL sheet) {
-        this.fqns = sheet;
+        this.pre = sheet;
     }
 
     @Override
@@ -94,7 +89,7 @@ public String name() {
     public Collection<Defect> defects(final Map<String, XML> pkg) {
         final Collection<Defect> defects = new LinkedList<>();
         final Map<XML, List<String>> index = pkg.values().stream()
-            .map(this.fqns::transform)
+            .map(this.pre::transform)
             .collect(Collectors.toMap(Function.identity(), LtAtomIsNotUnique::fqns));
         final Collection<String> checked = new HashSet<>(0);
         index.forEach(
@@ -186,7 +181,19 @@ private Defect sharedDefect(final XML xmir, final XML original, final String fqn
     }
 
     private static List<String> fqns(final XML xmir) {
-        return new ListOf<>(xmir.xpath("//o[@fqn]/@fqn"));
+        final List<String> result;
+        final List<String> fqns = xmir.xpath("//o[@fqn]/@fqn");
+        if (xmir.nodes("/program/metas/meta[head='package']").size() == 1) {
+            final String pack = xmir.xpath("/program/metas/meta[head='package']/tail/text()")
+                .get(0);
+            result = fqns.stream().map(fqn -> String.format("%s.%s", pack, fqn))
+                .collect(Collectors.toList());
+        } else {
+            result = fqns;
+        }
+        return result.stream()
+            .map(fqn -> String.format("Ф.%s", fqn))
+            .collect(Collectors.toList());
     }
 
     private static String oname(final String fqn) {

src/main/resources/org/eolang/funcs/atom-fqns.xsl

@@ -1,4 +1,28 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+The MIT License (MIT)
+
+Copyright (c) 2016-2024 Objectionary.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" id="atom-fqns" version="2.0">
   <xsl:template match="node()|@*">
     <xsl:copy>
       <xsl:apply-templates select="@*|node()"/>

src/test/java/org/eolang/lints/errors/LtAtomIsNotUniqueTest.java

@@ -89,19 +89,43 @@ void allowsSameAtomsWithDifferentFqns() throws Exception {
     @Test
     void catchesAtomDuplicatesWithinSamePackage() throws Exception {
         MatcherAssert.assertThat(
-            "Defects are empty, but they should not",
+            "Defects should be reported",
             new LtAtomIsNotUnique().defects(
                 new MapOf<String, XML>(
                     new MapEntry<>(
                         "foo-packaged",
                         new ParsedEo(
-                            "org/eolang/lints/errors/atom-is-not-unique/foo-packaged.eo"
+                            "org/eolang/lints/errors/atom-is-not-unique/app-1.eo"
                         ).value()
                     ),
                     new MapEntry<>(
                         "bar-packaged",
                         new ParsedEo(
-                            "org/eolang/lints/errors/atom-is-not-unique/bar-packaged.eo"
+                            "org/eolang/lints/errors/atom-is-not-unique/app-2.eo"
+                        ).value()
+                    )
+                )
+            ),
+            Matchers.hasSize(2)
+        );
+    }
+
+    @Test
+    void catchesNestedAtomDuplicates() throws Exception {
+        MatcherAssert.assertThat(
+            "Defects are empty, but they should not",
+            new LtAtomIsNotUnique().defects(
+                new MapOf<String, XML>(
+                    new MapEntry<>(
+                        "nested",
+                        new ParsedEo(
+                            "org/eolang/lints/errors/atom-is-not-unique/nested.eo"
+                        ).value()
+                    ),
+                    new MapEntry<>(
+                        "nested-dup",
+                        new ParsedEo(
+                            "org/eolang/lints/errors/atom-is-not-unique/nested-dup.eo"
                         ).value()
                     )
                 )
@@ -195,7 +219,7 @@ void allowsAtomsWithUniqueFqnsInSingleFile() throws Exception {
     }
 
     @Test
-    void allowsSameNameInComplexPackage() throws Exception {
+    void allowsSameNameWithPackageDifference() throws Exception {
         MatcherAssert.assertThat(
             "Defects aren't empty, but they should",
             new LtAtomIsNotUnique().defects(

…rrors/atom-is-not-unique/foo-packaged.eo …lints/errors/atom-is-not-unique/app-1.eosrc/test/resources/org/eolang/lints/errors/atom-is-not-unique/foo-packaged.eo renamed to src/test/resources/org/eolang/lints/errors/atom-is-not-unique/app-1.eo src/test/resources/org/eolang/lints/errors/atom-is-not-unique/foo-packaged.eo renamed to src/test/resources/org/eolang/lints/errors/atom-is-not-unique/app-1.eo

@@ -23,5 +23,5 @@
 +package xyz
 
 # Foo.
-[] > foo
-  [] > a /int
+[] > app
+  [] > foo /int

…g/lints/errors/atom-is-not-unique/dup.eo …lints/errors/atom-is-not-unique/app-2.eosrc/test/resources/org/eolang/lints/errors/atom-is-not-unique/dup.eo renamed to src/test/resources/org/eolang/lints/errors/atom-is-not-unique/app-2.eo src/test/resources/org/eolang/lints/errors/atom-is-not-unique/dup.eo renamed to src/test/resources/org/eolang/lints/errors/atom-is-not-unique/app-2.eo

@@ -20,8 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-# Dup.
-[attr] > dup
-  [] > foo /int
-  [] > @
++package xyz
+
+# Foo app duplicate.
+[] > app
   [] > foo /int

src/test/resources/org/eolang/lints/errors/atom-is-not-unique/fqns.xml

@@ -20,8 +20,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-+package xyz
-
-# Bar.
-[] > bar
-  [] > a /int
+# Top object with nested atoms inside.
+[] > top
+  [] > f
+    [] > a
+      [] > bar
+        [] > abr /string

…rrors/atom-is-not-unique/bar-packaged.eo …/errors/atom-is-not-unique/nested-dup.eosrc/test/resources/org/eolang/lints/errors/atom-is-not-unique/bar-packaged.eo renamed to src/test/resources/org/eolang/lints/errors/atom-is-not-unique/nested-dup.eo src/test/resources/org/eolang/lints/errors/atom-is-not-unique/bar-packaged.eo renamed to src/test/resources/org/eolang/lints/errors/atom-is-not-unique/nested-dup.eo

@@ -0,0 +1,29 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2016-2024 Objectionary.com
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# Top object with nested atoms inside.
+[] > top
+  [] > test /int
+  [] > f
+    [] > a
+      [] > bar
+        [] > abr /string

src/test/resources/org/eolang/lints/errors/atom-is-not-unique/nested.eo

@@ -20,7 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-+package y
++package xyz
 
-# X.
-[] > x /string
+# X packaged.
+[] > app
+  [] > x /string

src/test/resources/org/eolang/lints/errors/atom-is-not-unique/x-packaged.eo

@@ -21,4 +21,5 @@
 # SOFTWARE.
 
 # X.
-[] > x /string
+[] > app
+  [] > x /string