PR feedback

Author: aryairani

parser-typechecker/src/Unison/Codebase/Path.hs

@@ -24,6 +24,7 @@ module Unison.Codebase.Path
     prefix,
     unprefix,
     prefixName,
+    prefixName2,
     unprefixName,
     HQSplit,
     Split,
@@ -192,6 +193,11 @@ prefix (Absolute (Path prefix)) = \case
   AbsolutePath' abs -> unabsolute abs
   RelativePath' rel -> Path $ prefix <> toSeq (unrelative rel)
 
+prefix2 :: Path -> Path' -> Path
+prefix2 (Path prefix) = \case
+  AbsolutePath' abs -> unabsolute abs
+  RelativePath' rel -> Path $ prefix <> toSeq (unrelative rel)
+
 -- | Finds the longest shared path prefix of two paths.
 -- Returns (shared prefix, path to first location from shared prefix, path to second location from shared prefix)
 --
@@ -273,6 +279,9 @@ unprefixName prefix = toName . unprefix prefix . fromName'
 prefixName :: Absolute -> Name -> Name
 prefixName p n = fromMaybe n . toName . prefix p . fromName' $ n
 
+prefixName2 :: Path -> Name -> Name
+prefixName2 p n = fromMaybe n . toName . prefix2 p . fromName' $ n
+
 singleton :: NameSegment -> Path
 singleton n = fromList [n]
 

unison-cli/src/Unison/Codebase/Editor/HandleInput.hs

@@ -1429,30 +1429,28 @@ handleFindI ::
   Cli ()
 handleFindI isVerbose fscope ws input = do
   Cli.Env {codebase} <- ask
-  currentBranch0 <- Cli.getCurrentBranch0
-  (pped, names) <- case fscope of
-    FindLocal -> do
-      let names = Branch.toNames (Branch.withoutLib currentBranch0)
+  (pped, names, searchRoot, branch0) <- case fscope of
+    FindLocal p -> do
+      searchRoot <- Cli.resolvePath p
+      branch0 <- Cli.getBranch0At searchRoot
+      let names = Branch.toNames (Branch.withoutLib branch0)
       -- Don't exclude anything from the pretty printer, since the type signatures we print for
       -- results may contain things in lib.
       pped <- Cli.currentPrettyPrintEnvDecl
-      pure (pped, names)
-    FindLocalSubnamespace p -> do
-      path <- Cli.resolvePath p
-      branch0 <- Cli.getBranch0At path
-      let names = Branch.toNames branch0
-      pped <- Cli.currentPrettyPrintEnvDecl
-      pure (pped, names)
-    FindLocalAndDeps -> do
-      let names = Branch.toNames (Branch.withoutTransitiveLibs currentBranch0)
+      pure (pped, names, Just p, branch0)
+    FindLocalAndDeps p -> do
+      searchRoot <- Cli.resolvePath p
+      branch0 <- Cli.getBranch0At searchRoot
+      let names = Branch.toNames (Branch.withoutTransitiveLibs branch0)
       -- Don't exclude anything from the pretty printer, since the type signatures we print for
       -- results may contain things in lib.
       pped <- Cli.currentPrettyPrintEnvDecl
-      pure (pped, names)
+      pure (pped, names, Just p, branch0)
     FindGlobal -> do
       globalNames <- Names.makeAbsolute . Branch.toNames <$> Cli.getRootBranch0
       pped <- Cli.prettyPrintEnvDeclFromNames globalNames
-      pure (pped, globalNames)
+      currentBranch0 <- Cli.getCurrentBranch0
+      pure (pped, globalNames, Nothing, currentBranch0)
   let suffixifiedPPE = PPED.suffixifiedPPE pped
   let getResults :: Names -> Cli [SearchResult]
       getResults names =
@@ -1461,7 +1459,7 @@ handleFindI isVerbose fscope ws input = do
           -- type query
           ":" : ws -> do
             typ <- parseSearchType (show input) (unwords ws)
-            let keepNamed = Set.intersection (Branch.deepReferents currentBranch0)
+            let keepNamed = Set.intersection (Branch.deepReferents branch0)
             (noExactTypeMatches, matches) <- do
               Cli.runTransaction do
                 matches <- keepNamed <$> Codebase.termsOfType codebase typ
@@ -1487,16 +1485,16 @@ handleFindI isVerbose fscope ws input = do
                     (mapMaybe (HQ.parseTextWith anythingBeforeHash . Text.pack) qs)
             pure $ uniqueBy SR.toReferent srs
   let respondResults results = do
-        Cli.setNumberedArgs $ fmap searchResultToHQString results
+        Cli.setNumberedArgs $ fmap (searchResultToHQString searchRoot) results
         results' <- Cli.runTransaction (Backend.loadSearchResults codebase results)
         Cli.respond $ ListOfDefinitions fscope suffixifiedPPE isVerbose results'
   results <- getResults names
   case (results, fscope) of
-    ([], FindLocal) -> do
+    ([], FindLocal {}) -> do
       Cli.respond FindNoLocalMatches
       -- We've already searched everything else, so now we search JUST the
       -- names in lib.
-      let mayOnlyLibBranch = currentBranch0 & Branch.children %%~ \cs -> Map.singleton NameSegment.libSegment <$> Map.lookup NameSegment.libSegment cs
+      let mayOnlyLibBranch = branch0 & Branch.children %%~ \cs -> Map.singleton NameSegment.libSegment <$> Map.lookup NameSegment.libSegment cs
       case mayOnlyLibBranch of
         Nothing -> respondResults []
         Just onlyLibBranch -> do
@@ -1810,11 +1808,14 @@ confirmedCommand i = do
   pure $ Just i == (loopState ^. #lastInput)
 
 -- | restores the full hash to these search results, for _numberedArgs purposes
-searchResultToHQString :: SearchResult -> String
-searchResultToHQString = \case
-  SR.Tm' n r _ -> Text.unpack $ HQ.toText $ HQ.requalify n r
-  SR.Tp' n r _ -> Text.unpack $ HQ.toText $ HQ.requalify n (Referent.Ref r)
+searchResultToHQString :: Maybe Path -> SearchResult -> String
+searchResultToHQString oprefix = \case
+  SR.Tm' n r _ -> Text.unpack $ HQ.toText $ HQ.requalify (addPrefix <$> n) r
+  SR.Tp' n r _ -> Text.unpack $ HQ.toText $ HQ.requalify (addPrefix <$> n) (Referent.Ref r)
   _ -> error "impossible match failure"
+  where
+    addPrefix :: Name -> Name
+    addPrefix = maybe id Path.prefixName2 oprefix
 
 -- return `name` and `name.<everything>...`
 _searchBranchPrefix :: Branch m -> Name -> [SearchResult]

unison-cli/src/Unison/Codebase/Editor/Input.hs

@@ -313,9 +313,8 @@ data OutputLocation
   deriving (Eq, Show)
 
 data FindScope
-  = FindLocal
-  | FindLocalAndDeps
-  | FindLocalSubnamespace Path
+  = FindLocal Path
+  | FindLocalAndDeps Path
   | FindGlobal
   deriving stock (Eq, Show)
 

unison-cli/src/Unison/CommandLine/InputPatterns.hs

@@ -30,7 +30,7 @@ import Unison.Cli.ProjectUtils qualified as ProjectUtils
 import Unison.Codebase (Codebase)
 import Unison.Codebase qualified as Codebase
 import Unison.Codebase.Branch.Merge qualified as Branch
-import Unison.Codebase.Editor.Input (DeleteOutput (..), DeleteTarget (..), FindScope (FindLocalSubnamespace), Input)
+import Unison.Codebase.Editor.Input (DeleteOutput (..), DeleteTarget (..), Input)
 import Unison.Codebase.Editor.Input qualified as Input
 import Unison.Codebase.Editor.Output.PushPull (PushPull (Pull, Push))
 import Unison.Codebase.Editor.Output.PushPull qualified as PushPull
@@ -531,7 +531,7 @@ sfind :: InputPattern
 sfind =
   InputPattern "rewrite.find" ["sfind"] I.Visible [("rewrite-rule definition", Required, definitionQueryArg)] msg parse
   where
-    parse [q] = Input.StructuredFindI Input.FindLocal <$> parseHashQualifiedName q
+    parse [q] = Input.StructuredFindI (Input.FindLocal Path.empty) <$> parseHashQualifiedName q
     parse _ = Left "expected exactly one argument"
     msg =
       P.lines
@@ -589,27 +589,31 @@ sfindReplace =
         ]
 
 find :: InputPattern
-find = find' "find" Input.FindLocal
+find = find' "find" (Input.FindLocal Path.empty)
 
 findAll :: InputPattern
-findAll = find' "find.all" Input.FindLocalAndDeps
+findAll = find' "find.all" (Input.FindLocalAndDeps Path.empty)
 
 findGlobal :: InputPattern
 findGlobal = find' "find.global" Input.FindGlobal
 
-findIn :: InputPattern
-findIn =
+findIn, findInAll :: InputPattern
+findIn = findIn' "find-in" Input.FindLocal
+findInAll = findIn' "find-in.all" Input.FindLocalAndDeps
+
+findIn' :: String -> (Path.Path -> Input.FindScope) -> InputPattern
+findIn' cmd mkfscope =
   InputPattern
-    "find-in"
+    cmd
     []
     I.Visible
-    [("namespace", Required, namespaceArg)]
+    [("namespace", Required, namespaceArg), ("query", ZeroPlus, exactDefinitionArg)]
     findHelp
     \case
       p : args -> first P.text do
         p <- Path.parsePath p
-        pure (Input.FindI False (FindLocalSubnamespace p) args)
-      _ -> Left (I.help findIn)
+        pure (Input.FindI False (mkfscope p) args)
+      _ -> Left findHelp
 
 findHelp :: P.Pretty CT.ColorText
 findHelp =
@@ -623,7 +627,9 @@ findHelp =
           "lists all definitions with a name similar to 'foo' or 'bar' in the "
             <> "current namespace (excluding those under 'lib')."
         ),
-        ("`find-in namespace`", "lists all definitions in the specified subnamespace."),
+        ( "`find-in namespace`",
+          "lists all definitions in the specified subnamespace."
+        ),
         ( "`find-in namespace foo bar`",
           "lists all definitions with a name similar to 'foo' or 'bar' in the "
             <> "specified subnamespace."
@@ -632,6 +638,13 @@ findHelp =
           "lists all definitions with a name similar to 'foo' in the current "
             <> "namespace (including one level of 'lib')."
         ),
+        ( "`find-in.all namespace`",
+          "lists all definitions in the specified subnamespace (including one level of its 'lib')."
+        ),
+        ( "`find-in.all namespace foo bar`",
+          "lists all definitions with a name similar to 'foo' or 'bar' in the "
+            <> "specified subnamespace (including one level of its 'lib')."
+        ),
         ( "find.global foo",
           "lists all definitions with a name similar to 'foo' in any namespace"
         )
@@ -679,7 +692,7 @@ findVerbose =
     ( "`find.verbose` searches for definitions like `find`, but includes hashes "
         <> "and aliases in the results."
     )
-    (pure . Input.FindI True Input.FindLocal)
+    (pure . Input.FindI True (Input.FindLocal Path.empty))
 
 findVerboseAll :: InputPattern
 findVerboseAll =
@@ -691,7 +704,7 @@ findVerboseAll =
     ( "`find.all.verbose` searches for definitions like `find.all`, but includes hashes "
         <> "and aliases in the results."
     )
-    (pure . Input.FindI True Input.FindLocalAndDeps)
+    (pure . Input.FindI True (Input.FindLocalAndDeps Path.empty))
 
 findPatch :: InputPattern
 findPatch =
@@ -993,7 +1006,7 @@ up =
   InputPattern
     "deprecated.up"
     []
-    I.Visible
+    I.Hidden
     []
     (P.wrapColumn2 [(makeExample up [], "move current path up one level (deprecated)")])
     ( \case
@@ -3010,6 +3023,7 @@ validInputs =
       find,
       findIn,
       findAll,
+      findInAll,
       findGlobal,
       findPatch,
       findShallow,

unison-src/transcripts/find-command.md

@@ -1,29 +1,50 @@
-```unison
+```ucm:hide
+.> builtins.merge
+.> move builtin lib.builtin
+```
+
+```unison:hide
 foo = 1
 lib.foo = 2
 lib.bar = 3
+cat.foo = 4
+cat.lib.foo = 5
+cat.lib.bar = 6
+somewhere.bar = 7
 ```
 
-```ucm
+```ucm:hide
 .> add
 ```
 
 ```ucm
 .> find foo
+.> view 1
+.> find.all foo
+.> view 1
+```
+
+```ucm
+.> find-in cat foo
+.> view 1
+.> find-in.all cat foo
+.> view 1
 ```
 
 ```ucm
-.somewhere> find.global foo
+.somewhere> find bar
+.somewhere> find.global bar
 ```
 
 ```ucm
 .> find bar
+.> find-in somewhere bar
 ```
 
 ```ucm:error
 .> find baz
 ```
 
 ```ucm:error
-.> find.global nothere
+.> find.global notHere
 ```