Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-10 00:31:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

TypeScript and TSX Minor improvements

Browse Source
This commit is contained in:
Martín Lucas Golini
2023-05-24 01:02:16 -03:00
parent d368065efd
commit 6fa7f5c63b
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/eepp/ui/doc/syntaxdefinition.hpp
View File

@@ -55,6 +55,8 @@ class EE_API SyntaxDefinition {
SyntaxDefinition& addPattern( const SyntaxPattern& pattern );
SyntaxDefinition& setPatterns( const std::vector<SyntaxPattern>& patterns );
SyntaxDefinition& addPatternToFront( const SyntaxPattern& pattern );
SyntaxDefinition& addSymbol( const std::string& symbolName, const std::string& typeName );

5
src/eepp/ui/doc/syntaxdefinition.cpp
View File

@@ -80,6 +80,11 @@ SyntaxDefinition& SyntaxDefinition::addPattern( const SyntaxPattern& pattern ) {
return *this;
}
SyntaxDefinition& SyntaxDefinition::setPatterns( const std::vector<SyntaxPattern>& patterns ) {
mPatterns = patterns;
return *this;
}
SyntaxDefinition& SyntaxDefinition::addPatternToFront( const SyntaxPattern& pattern ) {
auto patterns = mPatterns;
mPatterns.clear();

20
src/eepp/ui/doc/syntaxdefinitionmanager.cpp
View File

@@ -441,8 +441,8 @@ static void addJavaScript() {
{
{ { "//.-\n" }, "comment" },
{ { "/%*", "%*/" }, "comment" },
{ { "/[%+%-%*%^%!%=%&%|%?%:%;%,%(%[%{%<%>%\\]", "/[igmsuyd][igmsuyd]?[igmsuyd]?",
"\\" },
{ { "/[%+%-%*%^%!%=%&%|%?%:%;%,%(%[%{%<%>%\\].*%f[/]",
"/[igmsuyd][igmsuyd]?[igmsuyd]?", "\\" },
"string" },
{ { "\"", "\"", "\\" }, "string" },
{ { "'", "'", "\\" }, "string" },
@@ -510,8 +510,8 @@ static void addTypeScript() {
{
{ { "//.-\n" }, "comment" },
{ { "/%*", "%*/" }, "comment" },
{ { "/[%+%-%*%^%!%=%&%|%?%:%;%,%(%[%{%<%>%\\]", "/[igmsuyd][igmsuyd]?[igmsuyd]?",
"\\" },
{ { "/[%+%-%*%^%!%=%&%|%?%:%;%,%(%[%{%<%>%\\].*%f[/]",
"/[igmsuyd][igmsuyd]?[igmsuyd]?", "\\" },
"string" },
{ { "\"", "\"", "\\" }, "string" },
{ { "'", "'", "\\" }, "string" },
@@ -549,10 +549,18 @@ static void addTypeScript() {
{ "with", "keyword" }, { "yield", "keyword" }, { "unknown", "keyword2" } },
"//" } );
const SyntaxDefinition& html = SyntaxDefinitionManager::instance()->getByLSPName( "xml" );
SyntaxDefinition tsxml( html );
tsxml.setLanguageName( "TSXML" );
tsxml.setFileTypes( {} );
tsxml.setVisible( false );
tsxml.addPatternToFront( { { "%{", "%}", "\\" }, "normal", "JavaScript" } );
SyntaxDefinitionManager::instance()->add( std::move( tsxml ) );
SyntaxDefinition tsx( ts );
tsx.setLanguageName( "TSX" );
tsx.setFileTypes( { "%.tsx$" } );
tsx.addPatternToFront( { { "return%s+%(", "%s*);" }, "keyword", "HTML" } );
tsx.addPatternToFront( { { "return%s+%(", "%s*);" }, "keyword", "TSXML" } );
SyntaxDefinitionManager::instance()->add( std::move( tsx ) );
}
@@ -4384,6 +4392,7 @@ SyntaxDefinitionManager::SyntaxDefinitionManager() {
addSwift();
addTeal();
addToml();
addXML();
addTypeScript();
addV();
addVisualBasic();
@@ -4391,7 +4400,6 @@ SyntaxDefinitionManager::SyntaxDefinitionManager() {
addWren();
addX86Assembly();
addxit();
addXML();
addYAML();
addZig();
}