Added support for Ruby syntax + image

eranif · Dec 7, 2021 · ded2d34 · ded2d34
1 parent e80ac6b
commit ded2d34
Show file tree

Hide file tree

Showing 21 changed files with 48,860 additions and 42,787 deletions.
diff --git a/CodeLite/fileextmanager.cpp b/CodeLite/fileextmanager.cpp
@@ -23,8 +23,8 @@
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 
-#include "fileextmanager.h"
 #include "JSON.h"
+#include "fileextmanager.h"
 #include "fileutils.h"
 #include <wx/filename.h>
 #include <wx/regex.h>
@@ -171,13 +171,17 @@ void FileExtManager::Init()
         m_map["patch"] = TypePatch;
         m_map["diff"] = TypeDiff;
 
+        m_map["rb"] = TypeRuby;
+
         // Initialize regexes:
         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/bin/bash", TypeShellScript));
         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/bin/bash", TypeShellScript));
         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/bin/sh", TypeShellScript));
         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/bin/bash", TypeShellScript));
         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/bin/python", TypePython));
         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/bin/python", TypePython));
+        m_matchers.push_back(Matcher("#[ \t]*![ \t]*/bin/ruby", TypeRuby));
+        m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/bin/ruby", TypeRuby));
         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/bin/node", TypeJS));
         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/bin/node", TypeJS));
         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/bin/nodejs", TypeJS));
@@ -186,6 +190,7 @@ void FileExtManager::Init()
         m_matchers.push_back(Matcher("<?php", TypePhp, false));
         m_matchers.push_back(Matcher("#!/usr/bin/env node", TypeJS, false));
         m_matchers.push_back(Matcher("#!/usr/bin/env nodejs", TypeJS, false));
+        m_matchers.push_back(Matcher("#!/usr/bin/env ruby", TypeRuby, false));
         m_matchers.push_back(Matcher("#!/usr/bin/env python", TypePython, false));
         m_matchers.push_back(Matcher("#!/usr/bin/env python3", TypePython, false));
         m_matchers.push_back(Matcher("SQLite format 3", TypeDatabase, false));

diff --git a/CodeLite/fileextmanager.h b/CodeLite/fileextmanager.h
@@ -94,6 +94,7 @@ class WXDLLIMPEXP_CL FileExtManager
         TypeFolderSymlinkExpanded, // For UI purposes only
         TypeLua,
         TypeRust,
+        TypeRuby,
         TypeDiff,
         TypePatch,
         TypeJSON,

diff --git a/Plugin/EclipseThemeImporterBase.cpp b/Plugin/EclipseThemeImporterBase.cpp
@@ -1,5 +1,5 @@
-#include "EclipseThemeImporterBase.h"
 #include "ColoursAndFontsManager.h"
+#include "EclipseThemeImporterBase.h"
 #include "cl_standard_paths.h"
 #include "drawingutils.h"
 #include "globals.h"
@@ -75,6 +75,8 @@ LexerConf::Ptr_t EclipseThemeImporterBase::InitializeImport(const wxFileName& ec
         return NULL;
     if(!GetProperty("keyword", m_keyword))
         return NULL;
+
+    // Optional
     if(!GetProperty("class", m_klass)) {
         m_klass = m_foreground;
     }
@@ -84,15 +86,18 @@ LexerConf::Ptr_t EclipseThemeImporterBase::InitializeImport(const wxFileName& ec
     if(!GetProperty("javadoc", m_javadoc)) {
         m_javadoc = m_multiLineComment;
     }
-
     if(!GetProperty("javadocKeyword", m_javadocKeyword)) {
         m_javadocKeyword = m_multiLineComment;
     }
     if(!GetProperty("method", m_function)) {
         m_function = m_foreground;
     }
-
-    m_oper = m_foreground;
+    if(!GetProperty("field", m_field)) {
+        m_field = m_foreground;
+    }
+    if(!GetProperty("enum", m_enum)) {
+        m_enum = m_foreground;
+    }
     return lexer;
 }
 

diff --git a/Plugin/EclipseThemeImporterBase.h b/Plugin/EclipseThemeImporterBase.h
@@ -72,6 +72,8 @@ class WXDLLIMPEXP_SDK EclipseThemeImporterBase
     Property m_javadoc;
     Property m_javadocKeyword;
     Property m_function;
+    Property m_field;
+    Property m_enum;
     wxString m_langName;
 
 protected:

diff --git a/Plugin/EclipseThemeImporterManager.cpp b/Plugin/EclipseThemeImporterManager.cpp
@@ -23,6 +23,7 @@
 #include "EclipseJsonThemeImporter.hpp"
 #include "EclipseRustThemeImporter.h"
 #endif
+#include "EclipseRubyThemeImporter.hpp"
 #include "EclipseSCSSThemeImporter.h"
 #include "EclipseSQLThemeImporter.h"
 #include "EclipseScriptThemeImporter.h"
@@ -57,6 +58,7 @@ EclipseThemeImporterManager::EclipseThemeImporterManager()
     m_importers.push_back(new EclipseSCSSThemeImporter());
     m_importers.push_back(new EclipseDockerfileThemeImporter());
     m_importers.push_back(new EclipseYAMLThemeImporter());
+    m_importers.push_back(new EclipseRubyThemeImporter());
 #if wxCHECK_VERSION(3, 1, 0)
     m_importers.push_back(new EclipseRustThemeImporter());
     m_importers.push_back(new EclipseJsonThemeImporter());

diff --git a/Runtime/codelite-bitmaps-dark.zip b/Runtime/codelite-bitmaps-dark.zip
diff --git a/Runtime/codelite-bitmaps-light.zip b/Runtime/codelite-bitmaps-light.zip