Merge branch 'main' into loop-invariant-code-motion

anoma · Dec 3, 2024 · bf71187 · bf71187
2 parents 7155464 + 97c29fb
commit bf71187
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/app/Commands/Init.hs b/app/Commands/Init.hs
@@ -49,7 +49,7 @@ init opts = do
   when isInteractive (renderStdOutLn @Text "you are all set")
   where
     isInteractive :: Bool
-    isInteractive = not (opts ^. initOptionsNonInteractive) && not (opts ^. initOptionsBasic)
+    isInteractive = opts ^. initOptionsInteractive
 
 checkNotInProject :: forall r. (Members '[EmbedIO, App] r) => Sem r ()
 checkNotInProject =

diff --git a/app/Commands/Init/Options.hs b/app/Commands/Init/Options.hs
@@ -3,7 +3,7 @@ module Commands.Init.Options where
 import CommonOptions
 
 data InitOptions = InitOptions
-  { _initOptionsNonInteractive :: Bool,
+  { _initOptionsInteractive :: Bool,
     _initOptionsBasic :: Bool
   }
   deriving stock (Data)
@@ -12,16 +12,16 @@ makeLenses ''InitOptions
 
 parseInitOptions :: Parser InitOptions
 parseInitOptions = do
-  _initOptionsNonInteractive <-
+  _initOptionsInteractive <-
     switch
-      ( long "non-interactive"
-          <> short 'n'
-          <> help "Run non-interactively. Generates a default Package.juvix"
+      ( long "interactive"
+          <> short 'i'
+          <> help "Run interactively"
       )
   _initOptionsBasic <-
     switch
       ( long "basic"
           <> short 'b'
-          <> help "Run non-interactively. Generates a basic Package.juvix that does not depend on the standard library"
+          <> help "Generate a basic Package.juvix that does not depend on the standard library"
       )
   pure InitOptions {..}
diff --git a/tests/smoke/Commands/format.smoke.yaml b/tests/smoke/Commands/format.smoke.yaml
@@ -212,12 +212,12 @@ tests:
         temp=$(mktemp -d)
         trap 'rm -rf -- "$temp"' EXIT
         pushd $temp > /dev/null
-        juvix init -n
+        juvix init
         popd > /dev/null
         cp positive/Format.juvix $temp
         mkdir $temp/sub
         pushd $temp/sub > /dev/null
-        juvix init -n
+        juvix init
         popd > /dev/null
         cp positive/Format.juvix $temp/sub
         juvix format $temp
@@ -364,4 +364,3 @@ tests:
     stderr:
       contains: juvix format error
     exit-status: 1
-
diff --git a/tests/smoke/Commands/init.smoke.yaml b/tests/smoke/Commands/init.smoke.yaml
@@ -19,7 +19,7 @@ tests:
         options:
           - dot-all
     exit-status: 0
-  - name: init-non-interactive-name
+  - name: init-name
     command:
       shell:
         - bash
@@ -28,7 +28,7 @@ tests:
         trap 'rm -rf -- "$temp"' EXIT
         mkdir "$temp/packagename"
         cd "$temp/packagename"
-        juvix init -n
+        juvix init
         juvix repl Package.juvix
     stdout:
       contains: '"packagename"'
@@ -42,21 +42,21 @@ tests:
         temp=$(mktemp -d)
         trap 'rm -rf -- "$temp"' EXIT
         cd $temp
-        echo -e 'packagename\n\n\n' | juvix init
+        echo -e 'packagename\n\n\n' | juvix init -i
         juvix repl Package.juvix
     stdout:
       contains: '"packagename"'
     stdin: Package.name package
     exit-status: 0
-  - name: init-version
+  - name: init-version-interactive
     command:
       shell:
         - bash
       script: |
         temp=$(mktemp -d)
         trap 'rm -rf -- "$temp"' EXIT
         cd $temp
-        echo -e 'packagename\n1.2.3-prerel+meta\n\n' | juvix init
+        echo -e 'packagename\n1.2.3-prerel+meta\n\n' | juvix init -i
         juvix repl Package.juvix
     stdout:
       contains: |