Fix bug where Info namespace had overlap with requested name

Author: hojberg

src/Code/CodebaseTree.elm

@@ -241,7 +241,7 @@ viewDefinitionListing openDefinitions listing =
                     "Term listing: " ++ FQN.toString fqn ++ "\n"
 
                 b =
-                    "OpenDefinitions" ++ (openDefinitions |> FQNSet.toList |> List.map FQN.toString |> String.join ", ")
+                    "OpenDefinitions: " ++ (openDefinitions |> FQNSet.toList |> List.map FQN.toString |> String.join ", ")
             in
             ProdDebug.view (a ++ b)
                 [ viewDefRow (TermReference (NameOnly fqn)) fqn (Category.name category) (Category.icon category)

src/Code/Definition/Info.elm

@@ -30,6 +30,10 @@ makeInfo ref suffixName allFqns_ =
     Info suffixName namespace otherNames
 
 
+
+-- Helpers
+
+
 allFqns : Info -> List FQN
 allFqns info =
     let
@@ -41,10 +45,6 @@ allFqns info =
     ListE.uniqueBy FQN.toString (reconstructed :: info.otherNames)
 
 
-
--- Helpers
-
-
 namespaceAndOtherNames : Reference -> FQN -> NEL.Nonempty FQN -> ( Maybe FQN, List FQN )
 namespaceAndOtherNames requestedRef suffixName fqns =
     let
@@ -60,22 +60,26 @@ namespaceAndOtherNames requestedRef suffixName fqns =
                 |> NEL.filter (FQN.isSuffixOf suffixName) defaultFqn
                 |> shortest
 
-        fqnWithin =
+        ( namespace, fqnWithin ) =
             case Reference.fqn requestedRef of
                 Just requestedName ->
                     if FQN.isSuffixOf suffixName requestedName then
-                        requestedName
+                        let
+                            toTake =
+                                FQN.length requestedName - FQN.length suffixName
+                        in
+                        ( Just (FQN.take toTake requestedName), shortestSuffixMatching )
 
                     else
-                        shortestSuffixMatching
+                        ( FQN.namespace shortestSuffixMatching, shortestSuffixMatching )
 
                 Nothing ->
-                    shortestSuffixMatching
+                    ( FQN.namespace shortestSuffixMatching, shortestSuffixMatching )
 
         fqnsWithout =
             fqns
                 |> NEL.toList
                 |> ListE.filterNot (FQN.equals fqnWithin)
                 |> ListE.uniqueBy FQN.toString
     in
-    ( FQN.namespace fqnWithin, fqnsWithout )
+    ( namespace, fqnsWithout )

src/Code/FullyQualifiedName.elm

@@ -17,13 +17,15 @@ module Code.FullyQualifiedName exposing
     , isSuffixOf
     , isValidSegmentChar
     , isValidUrlSegmentChar
+    , length
     , namespace
     , namespaceOf
     , numSegments
     , root
     , segments
     , snoc
     , stripPrefix
+    , take
     , toApiUrlString
     , toQueryString
     , toQueryString_
@@ -183,6 +185,11 @@ numSegments (FQN segments_) =
     NEL.length segments_
 
 
+length : FQN -> Int
+length (FQN segments_) =
+    NEL.length segments_
+
+
 {-| Drops the last segment of the FQN, unless there's only 1
 -}
 dropLast : FQN -> FQN
@@ -194,6 +201,11 @@ dropLast (FQN segments_) =
         )
 
 
+take : Int -> FQN -> FQN
+take n (FQN segments_) =
+    FQN (NEL.take n segments_)
+
+
 fromParent : FQN -> String -> FQN
 fromParent (FQN parentParts) childName =
     FQN (NEL.append parentParts (NEL.fromElement childName))
@@ -241,15 +253,10 @@ stripPrefix (FQN prefix) (FQN fqn_) =
 
         fqn__ =
             NEL.toList fqn_
-
-        potentialPrefix =
-            List.take (List.length prefix_) fqn__
     in
-    if prefix_ == potentialPrefix then
-        fromList (List.drop (List.length prefix_) fqn__)
-
-    else
-        fromList fqn__
+    ListE.stripPrefix prefix_ fqn__
+        |> Maybe.withDefault fqn__
+        |> fromList
 
 
 {-| Extend a FQN with another, removing exact overlaps in the right side list.
@@ -290,13 +297,13 @@ Check if the second FQN ends with the first FQN.
 
 -}
 isSuffixOf : FQN -> FQN -> Bool
-isSuffixOf suffixName fqn =
-    String.endsWith (toString suffixName) (toString fqn)
+isSuffixOf (FQN suffixName) (FQN fqn) =
+    ListE.isSuffixOf (NEL.toList suffixName) (NEL.toList fqn)
 
 
 isPrefixOf : FQN -> FQN -> Bool
-isPrefixOf prefixName fqn =
-    String.startsWith (toString prefixName) (toString fqn)
+isPrefixOf (FQN prefixName) (FQN fqn) =
+    ListE.isPrefixOf (NEL.toList prefixName) (NEL.toList fqn)
 
 
 isRoot : FQN -> Bool

src/Lib/ProdDebug.elm

@@ -1,4 +1,4 @@
-port module Lib.ProdDebug exposing (..)
+module Lib.ProdDebug exposing (..)
 
 import Html exposing (Html, node)
 import Html.Attributes exposing (attribute)
@@ -7,21 +7,3 @@ import Html.Attributes exposing (attribute)
 view : String -> List (Html msg) -> Html msg
 view debugMessage content =
     node "prod-debug" [ attribute "message" debugMessage ] content
-
-
-{-| This requires a port subscription by the host application.
-
-Something like:
-
-```javascript
-const app = Elm.HostApp.init({ flags });
-
-if (app.ports) {
-  app.ports.debugLog?.subscribe((text) => {
-    console.debug(text);
-  });
-}
-```
-
--}
-port debugLog : String -> Cmd msg

tests/Code/Definition/InfoTests.elm

@@ -30,4 +30,26 @@ namespaceAndOtherNames =
                         [ "base.List.map", "something.else.List.map" ]
                 in
                 Expect.equal expected otherNames
+        , test "does not have overlap in namespace" <|
+            \_ ->
+                let
+                    result =
+                        Info.namespaceAndOtherNames
+                            (Reference.fromString TermReference "BlogAuthor.bio.modify")
+                            (FQN.fromString "bio.modify")
+                            (NEL.Nonempty
+                                (FQN.fromString "BlogAuthor.bio.modify")
+                                [ FQN.fromString "Bio.change" ]
+                            )
+
+                    namespace =
+                        Tuple.first result |> Maybe.map FQN.toString
+
+                    otherNames =
+                        Tuple.second result |> List.map FQN.toString
+
+                    expected =
+                        ( Just "BlogAuthor", [ "Bio.change" ] )
+                in
+                Expect.equal expected ( namespace, otherNames )
         ]

tests/Code/FullyQualifiedNameSetTests.elm

@@ -1,9 +1,8 @@
 module Code.FullyQualifiedNameSetTests exposing (..)
 
-import Code.FullyQualifiedName as FQN exposing (..)
-import Code.FullyQualifiedNameSet as FQNSet exposing (..)
+import Code.FullyQualifiedName as FQN
+import Code.FullyQualifiedNameSet as FQNSet
 import Expect
-import List.Nonempty as NEL
 import Test exposing (..)