Userland: Move Shell code to be in a library directory

This change ensures that users can use LibShell easily understand this
library now, because we have an actual library directory.

In addition to that, we move the test scripts to Tests/LibShell, to
match the usual pattern of putting test-related files in the Tests/
directory.

Meta/Lagom/CMakeLists.txt

@@ -502,6 +502,7 @@ if (BUILD_LAGOM)
         Regex
         RIFF
         SoftGPU
+        Shell
         SQL
         Syntax
         TextCodec

Meta/Lagom/Fuzzers/FuzzShell.cpp

@@ -5,7 +5,7 @@
  */
 
 #include <AK/StringView.h>
-#include <Shell/Shell.h>
+#include <LibShell/Shell.h>
 #include <stddef.h>
 #include <stdint.h>
 

Meta/Lagom/Fuzzers/FuzzShellPosix.cpp

@@ -5,8 +5,8 @@
  */
 
 #include <AK/StringView.h>
-#include <Shell/PosixParser.h>
+#include <LibShell/PosixParser.h>
-#include <Shell/Shell.h>
+#include <LibShell/Shell.h>
 #include <stddef.h>
 #include <stdint.h>
 

Meta/lint-shell-scripts.sh

@@ -10,7 +10,7 @@ if [ "$#" -eq "0" ]; then
         git ls-files -- \
             '*.sh' \
             ':!:Ports' \
-            ':!:Userland/Shell/Tests' \
+            ':!:Tests/LibShell' \
             ':!:Base/home/anon/Tests' \
             ':!:Base/root/generate_manpages.sh' \
             ':!:Base/usr/share/shell' \

Tests/CMakeLists.txt

@@ -19,6 +19,7 @@ add_subdirectory(LibMarkdown)
 add_subdirectory(LibPDF)
 add_subdirectory(LibRegex)
 add_subdirectory(LibSemVer)
+add_subdirectory(LibShell)
 add_subdirectory(LibSQL)
 add_subdirectory(LibTest)
 add_subdirectory(LibTextCodec)

Tests/LibShell/CMakeLists.txt

@@ -0,0 +1,7 @@
+if (NOT ENABLE_FUZZERS)
+    install(DIRECTORY Tests/ DESTINATION usr/Tests/Shell
+            PATTERN "Tests/*"
+            PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
+            GROUP_EXECUTE GROUP_READ
+            WORLD_EXECUTE WORLD_READ)
+endif()

Userland/Applications/TextEditor/MainWidget.cpp

@@ -39,11 +39,11 @@
 #include <LibMarkdown/Document.h>
 #include <LibMarkdown/SyntaxHighlighter.h>
 #include <LibSQL/AST/SyntaxHighlighter.h>
+#include <LibShell/SyntaxHighlighter.h>
 #include <LibURL/URL.h>
 #include <LibWeb/CSS/SyntaxHighlighter/SyntaxHighlighter.h>
 #include <LibWeb/HTML/SyntaxHighlighter/SyntaxHighlighter.h>
 #include <LibWebView/OutOfProcessWebView.h>
-#include <Shell/SyntaxHighlighter.h>
 
 namespace TextEditor {
 

Userland/BuggieBox/main.cpp

@@ -7,7 +7,7 @@
 
 #include <AK/LexicalPath.h>
 #include <LibMain/Main.h>
-#include <Userland/Shell/Shell.h>
+#include <LibShell/Shell.h>
 
 #define ENUMERATE_UTILITIES(E, ALIAS) \
     ALIAS(b2sum, checksum)            \

Userland/DevTools/HackStudio/Editor.cpp

@@ -37,13 +37,13 @@
 #include <LibMarkdown/Document.h>
 #include <LibMarkdown/SyntaxHighlighter.h>
 #include <LibSQL/AST/SyntaxHighlighter.h>
+#include <LibShell/SyntaxHighlighter.h>
 #include <LibSyntax/Language.h>
 #include <LibWeb/CSS/SyntaxHighlighter/SyntaxHighlighter.h>
 #include <LibWeb/DOM/Text.h>
 #include <LibWeb/HTML/HTMLHeadElement.h>
 #include <LibWeb/HTML/SyntaxHighlighter/SyntaxHighlighter.h>
 #include <LibWebView/OutOfProcessWebView.h>
-#include <Shell/SyntaxHighlighter.h>
 #include <fcntl.h>
 
 namespace HackStudio {

Userland/Libraries/CMakeLists.txt

@@ -50,6 +50,7 @@ add_subdirectory(LibRegex)
 add_subdirectory(LibRIFF)
 add_subdirectory(LibSanitizer)
 add_subdirectory(LibSemVer)
+add_subdirectory(LibShell)
 add_subdirectory(LibSoftGPU)
 add_subdirectory(LibSQL)
 add_subdirectory(LibSymbolication)

Userland/Libraries/LibCodeComprehension/Shell/ShellComprehensionEngine.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <LibCodeComprehension/CodeComprehensionEngine.h>
-#include <Shell/Shell.h>
+#include <LibShell/Shell.h>
 
 namespace CodeComprehension::Shell {
 

Userland/Libraries/LibShell/CMakeLists.txt

@@ -0,0 +1,20 @@
+set(SOURCES
+    AST.cpp
+    Builtin.cpp
+    Formatter.cpp
+    ImmediateFunctions.cpp
+    Job.cpp
+    NodeVisitor.cpp
+    Parser.cpp
+    PosixLexer.cpp
+    PosixParser.cpp
+    Shell.cpp
+)
+
+serenity_lib(LibShell shell)
+target_link_libraries(LibShell PRIVATE LibCore LibRegex LibLine LibFileSystem LibSyntax LibURL)
+
+if (SERENITYOS)
+    target_sources(LibShell PRIVATE SyntaxHighlighter.cpp)
+    target_link_libraries(LibShell PRIVATE LibCodeComprehension)
+endif()

Userland/Libraries/LibShell/PosixLexer.cpp

@@ -5,7 +5,7 @@
  */
 
 #include <AK/CharacterTypes.h>
-#include <Shell/PosixLexer.h>
+#include <LibShell/PosixLexer.h>
 
 static bool is_operator(StringView text)
 {

Userland/Libraries/LibShell/PosixLexer.h

@@ -12,7 +12,7 @@
 #include <AK/TemporaryChange.h>
 #include <AK/Variant.h>
 #include <AK/Vector.h>
-#include <Shell/AST.h>
+#include <LibShell/AST.h>
 
 namespace Shell::Posix {
 

Userland/Libraries/LibShell/PosixParser.cpp

@@ -7,8 +7,8 @@
 #include <AK/CharacterTypes.h>
 #include <AK/Debug.h>
 #include <AK/StringUtils.h>
-#include <Shell/Parser.h>
+#include <LibShell/Parser.h>
-#include <Shell/PosixParser.h>
+#include <LibShell/PosixParser.h>
 
 #define TRY_OR_THROW_PARSE_ERROR_AT(expr, position) ({                                                     \
     /* Ignore -Wshadow to allow nesting the macro. */                                                      \

Userland/Libraries/LibShell/PosixParser.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <Shell/AST.h>
+#include <LibShell/AST.h>
-#include <Shell/PosixLexer.h>
+#include <LibShell/PosixLexer.h>
 
 namespace Shell::Posix {
 

Userland/Libraries/LibShell/Shell.cpp

@@ -30,8 +30,8 @@
 #include <LibCore/Timer.h>
 #include <LibFileSystem/FileSystem.h>
 #include <LibLine/Editor.h>
+#include <LibShell/PosixParser.h>
 #include <LibURL/URL.h>
-#include <Shell/PosixParser.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>

Userland/Libraries/LibShell/SyntaxHighlighter.cpp

@@ -9,10 +9,10 @@
 #include <AK/TemporaryChange.h>
 #include <LibGfx/Font/Font.h>
 #include <LibGfx/Palette.h>
+#include <LibShell/NodeVisitor.h>
+#include <LibShell/Parser.h>
+#include <LibShell/SyntaxHighlighter.h>
 #include <LibSyntax/Document.h>
-#include <Shell/NodeVisitor.h>
-#include <Shell/Parser.h>
-#include <Shell/SyntaxHighlighter.h>
 
 namespace Shell {
 

Userland/Shell/CMakeLists.txt

@@ -4,38 +4,11 @@ serenity_component(
     TARGETS Shell
 )
 
-set(SOURCES
-    AST.cpp
-    Builtin.cpp
-    Formatter.cpp
-    ImmediateFunctions.cpp
-    Job.cpp
-    NodeVisitor.cpp
-    Parser.cpp
-    PosixLexer.cpp
-    PosixParser.cpp
-    Shell.cpp
-)
-
-serenity_lib(LibShell shell)
-target_link_libraries(LibShell PRIVATE LibCore LibFileSystem LibLine LibSyntax LibRegex LibURL)
-
-if (SERENITYOS)
-    target_sources(LibShell PRIVATE SyntaxHighlighter.cpp)
-    target_link_libraries(LibShell PRIVATE LibCodeComprehension)
-endif()
-
 if (ENABLE_FUZZERS)
     add_custom_target(Shell) # Stub target to placate serenity_component
 else()
     set(SOURCES main.cpp)
 
     serenity_bin(Shell)
-    target_link_libraries(Shell PRIVATE LibCore LibFileSystem LibLine LibShell LibMain)
+    target_link_libraries(Shell PRIVATE LibCore LibShell LibFileSystem LibLine LibMain)
-
-    install(DIRECTORY Tests/ DESTINATION usr/Tests/Shell
-            PATTERN "Tests/*"
-            PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
-            GROUP_EXECUTE GROUP_READ
-            WORLD_EXECUTE WORLD_READ)
 endif()

Userland/Shell/main.cpp

@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include "Shell.h"
 #include <AK/LexicalPath.h>
 #include <LibCore/ArgsParser.h>
 #include <LibCore/Event.h>
@@ -12,6 +11,7 @@
 #include <LibCore/System.h>
 #include <LibFileSystem/FileSystem.h>
 #include <LibMain/Main.h>
+#include <LibShell/Shell.h>
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>

Userland/Utilities/pkg/AvailablePortDatabase.cpp

@@ -22,11 +22,11 @@
 #include "AvailablePortDatabase.h"
 #include "MarkdownTableFinder.h"
 
-#include <Shell/AST.h>
+#include <LibShell/AST.h>
-#include <Shell/Formatter.h>
+#include <LibShell/Formatter.h>
-#include <Shell/NodeVisitor.h>
+#include <LibShell/NodeVisitor.h>
-#include <Shell/PosixParser.h>
+#include <LibShell/PosixParser.h>
-#include <Shell/Shell.h>
+#include <LibShell/Shell.h>
 
 void AvailablePortDatabase::query_details_for_package(HashMap<String, InstalledPort> const& installed_ports_map, StringView package_name, bool verbose)
 {