Added option to manually select the syntax highlighting language

CMakeLists.txt

@@ -144,6 +144,7 @@ if (TURBO_BUILD_APP)
     target_link_libraries(${TURBO} PRIVATE
         ${TURBO}-core
     )
+    target_link_libraries(${TURBO} PRIVATE -ltomlcpp)
     install(TARGETS ${TURBO} RUNTIME DESTINATION bin)
 
     if (WIN32)

README.md

@@ -26,6 +26,7 @@ Then, make sure the following dependencies are installed:
 * CMake.
 * A compiler supporting C++17.
 * `libncursesw` (note the 'w') (Unix only).
+* [`libtomlcpp`](https://github.com/cktan/tomlcpp/) (for saving editor config in `~/.config/turbo.toml`)
 
 Additionally, you may also want to install these optional dependencies:
 

include/turbo/editor.h

@@ -46,7 +46,6 @@ class Editor : protected TScintillaParent
     bool drawLock {false}; // To avoid recursive draws.
     bool reflowLock {false}; // When true, text stops flowing on resize.
 
-    void drawViews() noexcept;
     void updateMarginWidth() noexcept;
 
 protected:

include/turbo/fileeditor.h

@@ -96,7 +96,6 @@ class FileEditor : public Editor
     inline void setFilePath(Path &&path);
     void beforeSave() noexcept;
     void afterSave() noexcept;
-    void detectLanguage() noexcept;
 
 public:
 
@@ -110,8 +109,9 @@ class FileEditor : public Editor
     bool close(FileDialogs & = showAllDialogs) noexcept;
 
     // Called when 'filePath' is set. The default implementation calls
-    // 'detectLanguage'.
+    // 'setLanguage'.
     virtual void onFilePathSet() noexcept;
+    void setLanguage(const Language *lang) noexcept;
 };
 
 inline FileEditor::FileEditor(TScintilla &aScintilla, std::string aFilePath) noexcept :

include/turbo/styles.h

@@ -9,7 +9,8 @@ namespace turbo {
 
 struct Language
 {
-    TStringView lineComment {};
+    TStringView name {};
+    TStringView lineComment {};     // These are used by the editor to toggle comments on lines
     TStringView blockCommentOpen {};
     TStringView blockCommentClose {};
 
@@ -23,41 +24,47 @@ struct Language
         return !blockCommentOpen.empty() && !blockCommentClose.empty();
     }
 
-    static const Language
-        CPP,
-        Makefile,
+    enum {
+        Ada = 0,
         Asm,
-        JavaScript,
-        Rust,
-        Python,
         Bash,
+        Basic,
+        Batch,
+        CPP,
+        CSS,
+        CSharp,
         Diff,
-        JSON,
+        Erlang,
         HTML,
-        XML,
-        VB,
-        Perl,
-        Batch,
+        JSON,
+        JavaScript,
         LaTex,
-        Lua,
-        Ada,
         Lisp,
+        Lua,
+        MATLAB,
+        Makefile,
+        Markdown,
+        NuShell,
+        Pascal,
+        Perl,
+        Properties,
+        Python,
         Ruby,
+        Rust,
+        SQL,
+        Smalltalk,
         Tcl,
+        VB,
         VBScript,
-        MATLAB,
-        CSS,
+        XML,
         YAML,
-        Erlang,
-        Smalltalk,
-        Markdown,
-        Properties,
-        CSharp,
-        Basic,
-        Pascal,
-        SQL;
+
+        COUNT
+    };
 };
 
+extern const Language languages[Language::COUNT];    // Array of Language structs that should be indexed with the Language::* enum.
+
 enum TextStyle : uchar
 {
     sNormal,

source/turbo-core/fileeditor.cc

@@ -243,16 +243,16 @@ void FileEditor::afterSave() noexcept
     call(scintilla, SCI_SETSAVEPOINT, 0U, 0U);
 }
 
-void FileEditor::detectLanguage() noexcept
+void FileEditor::setLanguage(const Language *language) noexcept
 {
-    language = detectFileLanguage(filePath.c_str());
+    this->language = language;
     lexer = findBuiltInLexer(language);
     applyTheming(lexer, scheme, scintilla);
 }
 
 void FileEditor::onFilePathSet() noexcept
 {
-    detectLanguage();
+    setLanguage(detectFileLanguage(filePath.c_str()));
 }
 
 ShowAllDialogs showAllDialogs;