Differentiated TypeScript files from JavaScript files

eranif · Jun 15, 2024 · 7797be6 · 7797be6
1 parent dc88c9c
commit 7797be6
Show file tree

Hide file tree

Showing 11 changed files with 231 additions and 5 deletions.
diff --git a/CodeLite/fileextmanager.cpp b/CodeLite/fileextmanager.cpp
@@ -127,8 +127,9 @@ void FileExtManager::Init()
         m_map[wxT("sass")] = TypeCSS;
         m_map[wxT("js")] = TypeJS;
         m_map[wxT("javascript")] = TypeJS;
-        m_map[wxT("ts")] = TypeJS; // TypeScript, but we consider this a JavaScript
+        m_map[wxT("ts")] = TypeTypeScript;
         m_map[wxT("py")] = TypePython;
+        m_map[wxT("pyi")] = TypePython;
         m_map["json"] = TypeJSON;
         m_map["conf"] = TypeJSON; // CodeLite configuration files are marked as "conf"
         m_map["md"] = TypeMarkdown;

diff --git a/CodeLite/fileextmanager.h b/CodeLite/fileextmanager.h
@@ -107,6 +107,7 @@ class WXDLLIMPEXP_CL FileExtManager
         TypeTcl,
         TypeGo,
         TypeLast,
+        TypeTypeScript,
     };
 
 public:

diff --git a/LanguageServer/LanguageServerCluster.cpp b/LanguageServer/LanguageServerCluster.cpp
@@ -1104,7 +1104,7 @@ void LanguageServerCluster::DiscoverWorkspaceType()
                 FileExtManager::TypeSourceCpp, FileExtManager::TypeCSS,         FileExtManager::TypeHeader,
                 FileExtManager::TypeHtml,      FileExtManager::TypeJS,          FileExtManager::TypeJava,
                 FileExtManager::TypeLua,       FileExtManager::TypeRuby,        FileExtManager::TypeRust,
-                FileExtManager::TypePython,    FileExtManager::TypeDart,
+                FileExtManager::TypePython,    FileExtManager::TypeDart,        FileExtManager::TypeTypeScript,
             };
             for (const wxString& file : files) {
                 auto file_type = FileExtManager::GetType(file);

diff --git a/Plugin/ColoursAndFontsManager.cpp b/Plugin/ColoursAndFontsManager.cpp
@@ -350,6 +350,7 @@ LexerConf::Ptr_t ColoursAndFontsManager::GetLexerForFile(const wxString& filenam
             lexerByContent = GetLexer("script");
             break;
         case FileExtManager::TypeJS:
+        case FileExtManager::TypeTypeScript:
             lexerByContent = GetLexer("javascript");
             break;
         case FileExtManager::TypePhp:
@@ -728,6 +729,10 @@ LexerConf::Ptr_t ColoursAndFontsManager::DoAddLexer(JSONItem json)
         lexer->SetFileSpec(filespec);
     }
 
+    if (lexer->GetName() == "javascript") {
+        AddLexerKeywords(lexer, 0, { "async", "await" });
+    }
+
     // Hack: fix Java lexer which is using the same
     // file extensions as C++...
     if (lexer->GetName() == "java" && lexer->GetFileSpec().Contains(".cpp")) {

diff --git a/Plugin/LSP/LanguageServerProtocol.cpp b/Plugin/LSP/LanguageServerProtocol.cpp
@@ -120,12 +120,15 @@ LanguageServerProtocol::~LanguageServerProtocol()
 wxString LanguageServerProtocol::GetLanguageId(FileExtManager::FileType file_type)
 {
     switch (file_type) {
+    case FileExtManager::TypeGo:
+        return "go";
     case FileExtManager::TypeSourceC:
         return "c";
     case FileExtManager::TypeSourceCpp:
     case FileExtManager::TypeHeader:
         return "cpp";
     case FileExtManager::TypeJS:
+    case FileExtManager::TypeTypeScript:
         return "javascript";
     case FileExtManager::TypeDockerfile:
         return "dockerfile";

diff --git a/Plugin/ThemeImporters/ThemeImporterJavaScript.cpp b/Plugin/ThemeImporters/ThemeImporterJavaScript.cpp
@@ -60,6 +60,7 @@ ThemeImporterJavaScript::ThemeImporterJavaScript()
     SetFunctionsWordSetIndex(1);
     SetClassWordSetIndex(3);
     SetOthersWordSetIndex(4);
+    SetLangName("javascript");
     SetLocalsWordSetIndex(LexerConf::WS_VARIABLES, true);
     SetFileExtensions("*.js;*.javascript;*.qml;*.json;*.ts");
 }
@@ -68,7 +69,7 @@ ThemeImporterJavaScript::~ThemeImporterJavaScript() {}
 
 LexerConf::Ptr_t ThemeImporterJavaScript::Import(const wxFileName& theme_file)
 {
-    LexerConf::Ptr_t lexer = InitializeImport(theme_file, "javascript", wxSTC_LEX_CPP);
+    LexerConf::Ptr_t lexer = InitializeImport(theme_file, GetLangName(), wxSTC_LEX_CPP);
     CHECK_PTR_RET_NULL(lexer);
 
     // Covnert to codelite's XML properties

diff --git a/Plugin/bitmap_loader.cpp b/Plugin/bitmap_loader.cpp
@@ -167,6 +167,7 @@ void BitmapLoader::CreateMimeList()
         m_mimeBitmaps.AddBitmap(LoadBitmap("mime-python", 16), FileExtManager::TypePython);
         m_mimeBitmaps.AddBitmap(LoadBitmap("mime-css", 16), FileExtManager::TypeCSS);
         m_mimeBitmaps.AddBitmap(LoadBitmap("mime-js", 16), FileExtManager::TypeJS);
+        m_mimeBitmaps.AddBitmap(LoadBitmap("mime-ts", 16), FileExtManager::TypeTypeScript);
         m_mimeBitmaps.AddBitmap(LoadBitmap("mime-java", 16), FileExtManager::TypeJava);
         m_mimeBitmaps.AddBitmap(LoadBitmap("mime-go", 16), FileExtManager::TypeGo);
         m_mimeBitmaps.AddBitmap(LoadBitmap("cxx-workspace", 16), FileExtManager::TypeWorkspace);

diff --git a/svgs/dark-theme/mime-js.svg b/svgs/dark-theme/mime-js.svg
diff --git a/svgs/dark-theme/mime-ts.svg b/svgs/dark-theme/mime-ts.svg
diff --git a/svgs/light-theme/mime-js.svg b/svgs/light-theme/mime-js.svg
diff --git a/svgs/light-theme/mime-ts.svg b/svgs/light-theme/mime-ts.svg
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,6 +107,7 @@ class WXDLLIMPEXP_CL FileExtManager @@
             TypeTcl,
             TypeGo,
             TypeLast,
+            TypeTypeScript,
         };
     public:
@@ Expand Down @@