Syntax Definitions are going to be loaded on-demand instead of during start-up (this allows to add as many as wanted without worrying about memory usage or load times).

Added Racket syntax highlighting and LSP support (SpartanJ/ecode#459).

bin/assets/plugins/lspclient.json

@@ -59,8 +59,10 @@
       "initializationOptions": {
         "usePlaceholders": true,
         "semanticTokens": true,
-        "noSemanticString": true,
-        "noSemanticNumber": true
+        "semanticTokenTypes": {
+          "string": false,
+          "number": false
+        }
       }
     },
     {
@@ -414,6 +416,14 @@
       "command": "u.._language_server",
       "file_patterns": ["%.u$", "%.uh$"],
       "rootIndicationFileNames": [".git"]
+    },
+    {
+      "language": "racket",
+      "name": "racket-langserver",
+      "url": "https://github.com/jeapostrophe/racket-langserver",
+      "command": "racket -l racket-langserver",
+      "file_patterns": ["%.rkt$"],
+      "rootIndicationFileNames": [".git"]
     }
   ]
 }

include/eepp/ui/doc/syntaxdefinition.hpp

@@ -134,6 +134,41 @@ struct EE_API SyntaxPattern {
 	inline bool hasContentScope() const { return contentScopeRepoHash != 0; }
 };
 
+struct EE_API SyntaxPreDefinition {
+	std::string name;
+	std::function<SyntaxDefinition&()> load;
+	std::vector<std::string> files;
+	std::vector<std::string> headers;
+	std::string lspName;
+	std::vector<std::string> alternativeNames;
+	bool extensionPriority{ false };
+
+	SyntaxPreDefinition( const std::string& name, std::function<SyntaxDefinition&()> load,
+						 std::vector<std::string>&& files, std::vector<std::string>&& headers = {},
+						 const std::string& lspName = "",
+						 std::vector<std::string>&& alternativeNames = {},
+						 bool extensionPriority = false ) :
+		name( name ),
+		load( load ),
+		files( std::move( files ) ),
+		headers( std::move( headers ) ),
+		lspName( lspName.empty() ? String::toLower( name ) : lspName ),
+		alternativeNames( std::move( alternativeNames ) ),
+		extensionPriority( extensionPriority ) {}
+
+	const std::string& getLanguageName() const { return name; }
+
+	const std::vector<std::string>& getAlternativeNames() const { return alternativeNames; }
+
+	const std::string& getLSPName() const { return lspName; }
+
+	const std::vector<std::string>& getFiles() const { return files; }
+
+	bool hasExtensionPriority() const { return extensionPriority; }
+
+	const std::vector<std::string>& getHeaders() const { return headers; }
+};
+
 class EE_API SyntaxDefinition {
   public:
 	SyntaxDefinition();
@@ -149,8 +184,6 @@ class EE_API SyntaxDefinition {
 
 	std::string getLanguageNameForFileSystem() const;
 
-	const String::HashType& getLanguageId() const;
-
 	const std::vector<std::string>& getFiles() const;
 
 	std::string getFileExtension() const;
@@ -264,7 +297,6 @@ class EE_API SyntaxDefinition {
 	friend class SyntaxDefinitionManager;
 
 	std::string mLanguageName;
-	String::HashType mLanguageId;
 	std::vector<std::string> mFiles;
 	std::vector<SyntaxPattern> mPatterns;
 	SyntaxDefMap<std::string, SyntaxStyleType> mSymbols;

include/eepp/ui/doc/syntaxdefinitionmanager.hpp

@@ -22,7 +22,7 @@ class EE_API SyntaxDefinitionManager {
 
 	std::size_t count() const;
 
-	void reserveSpaceForLanguages( std::size_t totalLangs );
+	SyntaxPreDefinition& addPreDefinition( SyntaxPreDefinition&& preDefinition );
 
 	SyntaxDefinition& add( SyntaxDefinition&& syntaxStyle );
 
@@ -53,20 +53,12 @@ class EE_API SyntaxDefinitionManager {
 
 	const SyntaxDefinition& getByLSPName( const std::string_view& name ) const;
 
-	const SyntaxDefinition& getByLanguageId( const String::HashType& id ) const;
-
-	SyntaxDefinition& getByLanguageNameRef( const std::string& name );
-
 	std::vector<std::string> getLanguageNames() const;
 
 	std::vector<std::string> getExtensionsPatternsSupported() const;
 
-	const SyntaxDefinition* getPtrByLanguageName( const std::string& name ) const;
-
 	const SyntaxDefinition* getPtrByLSPName( const std::string& name ) const;
 
-	const SyntaxDefinition* getPtrByLanguageId( const String::HashType& id ) const;
-
 	bool loadFromStream( IOStream& stream, std::vector<std::string>* addedLangs );
 
 	bool loadFromStream( IOStream& stream );
@@ -81,6 +73,8 @@ class EE_API SyntaxDefinitionManager {
 
 	const std::vector<SyntaxDefinition>& getDefinitions() const;
 
+	const std::vector<SyntaxPreDefinition>& getPreDefinitions() const;
+
 	/* empty = all */
 	bool save( const std::string& path, const std::vector<SyntaxDefinition>& def = {} );
 
@@ -92,6 +86,7 @@ class EE_API SyntaxDefinitionManager {
 	SyntaxDefinitionManager( std::size_t reserveSpaceForLanguages = 12 );
 
 	std::vector<SyntaxDefinition> mDefinitions;
+	std::vector<SyntaxPreDefinition> mPreDefinitions;
 	std::map<std::string, std::string> mPriorities;
 
 	std::optional<size_t> getLanguageIndex( const std::string& langName );

src/eepp/ui/doc/syntaxdefinition.cpp

@@ -105,7 +105,6 @@ SyntaxDefinition::SyntaxDefinition(
 	const std::string& comment, std::vector<std::string>&& headers, const std::string& lspName,
 	std::vector<std::pair<std::string, std::vector<SyntaxPattern>>>&& repositories ) :
 	mLanguageName( languageName ),
-	mLanguageId( String::hash( String::toLower( languageName ) ) ),
 	mFiles( std::move( files ) ),
 	mPatterns( std::move( patterns ) ),
 	mSymbolNames( std::move( symbols ) ),
@@ -314,7 +313,6 @@ SyntaxDefinition& SyntaxDefinition::setAutoCloseXMLTags( bool autoCloseXMLTags )
 SyntaxDefinition& SyntaxDefinition::setLanguageName( const std::string& languageName ) {
 	mLanguageName = languageName;
 	mLSPName = String::toLower( languageName );
-	mLanguageId = String::hash( mLSPName );
 	return *this;
 }
 
@@ -340,10 +338,6 @@ std::string SyntaxDefinition::getLanguageNameForFileSystem() const {
 	return lang;
 }
 
-const String::HashType& SyntaxDefinition::getLanguageId() const {
-	return mLanguageId;
-}
-
 SyntaxPattern::SyntaxPattern( std::vector<std::string>&& _patterns, const std::string& _type,
 							  const std::string& _syntax, SyntaxPatternMatchType matchType ) :
 	patterns( std::move( _patterns ) ),

src/eepp/ui/doc/syntaxdefinitionmanager.cpp

@@ -197,6 +197,10 @@ const std::vector<SyntaxDefinition>& SyntaxDefinitionManager::getDefinitions() c
 	return mDefinitions;
 }
 
+const std::vector<SyntaxPreDefinition>& SyntaxDefinitionManager::getPreDefinitions() const {
+	return mPreDefinitions;
+}
+
 static std::optional<nlohmann::json> serializePattern( const SyntaxPattern& ptrn,
 													   const SyntaxDefinition& def ) {
 	json pattern;
@@ -434,18 +438,19 @@ std::pair<std::string, std::string> SyntaxDefinitionManager::toCPP( const Syntax
 
 	std::string lang( def.getLanguageNameForFileSystem() );
 	std::string func( funcName( lang ) );
-	std::string header = "#ifndef EE_UI_DOC_" + func + "\n#define EE_UI_DOC_" + func +
-						 "\n\nnamespace EE { namespace UI { namespace "
-						 "Doc { namespace Language {\n\nextern void add" +
-						 func + "();\n\n}}}}\n\n#endif\n";
+	std::string header =
+		"#ifndef EE_UI_DOC_" + func + "\n#define EE_UI_DOC_" + func +
+		"\n#include <eepp/ui/doc/syntaxdefinition.hpp>\n\nnamespace EE { namespace UI { namespace "
+		"Doc { namespace Language {\n\nextern SyntaxDefinition& add" +
+		func + "();\n\n}}}}\n\n#endif\n";
 	std::string buf = String::format( R"cpp(#include <eepp/ui/doc/languages/%s.hpp>
 #include <eepp/ui/doc/syntaxdefinitionmanager.hpp>
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 )cpp",
 									  lang.c_str() );
-	buf += "\nvoid add" + func + "() {\n";
-	buf += "\nSyntaxDefinitionManager::instance()->add(\n\n{";
+	buf += "\nSyntaxDefinition& add" + func + "() {\n";
+	buf += "\nreturn SyntaxDefinitionManager::instance()->add(\n\n{";
 	// lang name
 	buf += str( def.getLanguageName() ) + ",\n";
 	// file types
@@ -529,6 +534,12 @@ SyntaxDefinition& SyntaxDefinitionManager::add( SyntaxDefinition&& syntaxStyle )
 	return mDefinitions.back();
 }
 
+SyntaxPreDefinition&
+SyntaxDefinitionManager::addPreDefinition( SyntaxPreDefinition&& preDefinition ) {
+	mPreDefinitions.emplace_back( std::move( preDefinition ) );
+	return mPreDefinitions.back();
+}
+
 const SyntaxDefinition& SyntaxDefinitionManager::getPlainDefinition() const {
 	return mDefinitions[0];
 }
@@ -539,7 +550,7 @@ SyntaxDefinition& SyntaxDefinitionManager::getByExtensionRef( const std::string&
 
 const SyntaxDefinition&
 SyntaxDefinitionManager::getByLanguageName( const std::string_view& name ) const {
-	for ( auto& definition : mDefinitions ) {
+	for ( const auto& definition : mDefinitions ) {
 		if ( definition.getLanguageName() == name ||
 			 std::find_if( definition.getAlternativeNames().begin(),
 						   definition.getAlternativeNames().end(),
@@ -547,6 +558,17 @@ SyntaxDefinitionManager::getByLanguageName( const std::string_view& name ) const
 				 definition.getAlternativeNames().end() )
 			return definition;
 	}
+
+	for ( const auto& preDefinition : mPreDefinitions ) {
+		if ( preDefinition.name == name ||
+			 std::find_if( preDefinition.alternativeNames.begin(),
+						   preDefinition.alternativeNames.end(),
+						   [name]( const std::string& altName ) { return altName == name; } ) !=
+				 preDefinition.alternativeNames.end() ) {
+			return preDefinition.load();
+		}
+	}
+
 	return mDefinitions[0];
 }
 
@@ -557,7 +579,7 @@ const SyntaxDefinition& SyntaxDefinitionManager::getByLanguageIndex( const Uint3
 
 const SyntaxDefinition&
 SyntaxDefinitionManager::getByLanguageNameInsensitive( const std::string_view& name ) const {
-	for ( auto& definition : mDefinitions ) {
+	for ( const auto& definition : mDefinitions ) {
 		if ( String::iequals( definition.getLanguageName(), name ) ||
 			 std::find_if( definition.getAlternativeNames().begin(),
 						   definition.getAlternativeNames().end(),
@@ -566,57 +588,66 @@ SyntaxDefinitionManager::getByLanguageNameInsensitive( const std::string_view& n
 						   } ) != definition.getAlternativeNames().end() )
 			return definition;
 	}
+
+	for ( const auto& preDefinition : mPreDefinitions ) {
+		if ( String::iequals( preDefinition.getLanguageName(), name ) ||
+			 std::find_if( preDefinition.getAlternativeNames().begin(),
+						   preDefinition.getAlternativeNames().end(),
+						   [name]( const std::string& altName ) {
+							   return String::iequals( altName, name );
+						   } ) != preDefinition.getAlternativeNames().end() )
+			return preDefinition.load();
+	}
+
 	return mDefinitions[0];
 }
 
 const SyntaxDefinition&
 SyntaxDefinitionManager::getByLSPName( const std::string_view& name ) const {
-	for ( auto& definition : mDefinitions ) {
+	for ( const auto& definition : mDefinitions ) {
 		if ( definition.getLSPName() == name )
 			return definition;
 	}
-	return mDefinitions[0];
-}
-
-const SyntaxDefinition&
-SyntaxDefinitionManager::getByLanguageId( const String::HashType& id ) const {
-	for ( auto& definition : mDefinitions ) {
-		if ( definition.getLanguageId() == id )
-			return definition;
+	for ( const auto& preDefinition : mPreDefinitions ) {
+		if ( preDefinition.getLSPName() == name )
+			return preDefinition.load();
 	}
 	return mDefinitions[0];
 }
 
-SyntaxDefinition& SyntaxDefinitionManager::getByLanguageNameRef( const std::string& name ) {
-	return const_cast<SyntaxDefinition&>( getByLanguageName( name ) );
-}
-
 std::vector<std::string> SyntaxDefinitionManager::getLanguageNames() const {
-	std::vector<std::string> names;
+	std::unordered_set<std::string> names;
 	for ( auto& definition : mDefinitions ) {
 		if ( definition.isVisible() )
-			names.push_back( definition.getLanguageName() );
+			names.insert( definition.getLanguageName() );
 	}
-	std::sort( names.begin(), names.end() );
-	return names;
+	for ( auto& preDefinition : mPreDefinitions )
+		names.insert( preDefinition.getLanguageName() );
+	std::vector<std::string> vnames;
+	vnames.reserve( names.size() );
+	for ( auto& name : names )
+		vnames.emplace_back( std::move( name ) );
+	std::sort( vnames.begin(), vnames.end() );
+	return vnames;
 }
 
 std::vector<std::string> SyntaxDefinitionManager::getExtensionsPatternsSupported() const {
-	std::vector<std::string> exts;
+	std::unordered_set<std::string> exts;
 	exts.reserve( mDefinitions.size() );
 	for ( auto& definition : mDefinitions )
 		for ( auto& pattern : definition.getFiles() )
-			exts.emplace_back( pattern );
-	return exts;
-}
+			exts.insert( pattern );
 
-const SyntaxDefinition*
-SyntaxDefinitionManager::getPtrByLanguageName( const std::string& name ) const {
-	for ( const auto& definition : mDefinitions ) {
-		if ( definition.getLanguageName() == name )
-			return &definition;
-	}
-	return nullptr;
+	for ( auto& preDefinition : mPreDefinitions )
+		for ( auto& pattern : preDefinition.getFiles() )
+			exts.insert( pattern );
+
+	std::vector<std::string> vexts;
+	vexts.reserve( exts.size() );
+	for ( auto& ext : exts )
+		vexts.emplace_back( std::move( ext ) );
+	std::sort( vexts.begin(), vexts.end() );
+	return vexts;
 }
 
 const SyntaxDefinition* SyntaxDefinitionManager::getPtrByLSPName( const std::string& name ) const {
@@ -624,14 +655,9 @@ const SyntaxDefinition* SyntaxDefinitionManager::getPtrByLSPName( const std::str
 		if ( definition.getLSPName() == name )
 			return &definition;
 	}
-	return nullptr;
-}
-
-const SyntaxDefinition*
-SyntaxDefinitionManager::getPtrByLanguageId( const String::HashType& id ) const {
-	for ( const auto& definition : mDefinitions ) {
-		if ( definition.getLanguageId() == id )
-			return &definition;
+	for ( const auto& preDefinition : mPreDefinitions ) {
+		if ( preDefinition.getLSPName() == name )
+			return &preDefinition.load();
 	}
 	return nullptr;
 }
@@ -1082,6 +1108,24 @@ SyntaxDefinitionManager::languagesThatSupportExtension( std::string extension )
 			}
 		}
 	}
+
+	for ( const auto& preDefinition : mPreDefinitions ) {
+		for ( const auto& ext : preDefinition.getFiles() ) {
+			if ( String::startsWith( ext, "%." ) || String::startsWith( ext, "^" ) ||
+				 String::endsWith( ext, "$" ) ) {
+				LuaPattern words( ext );
+				int start, end;
+				if ( words.find( extension, start, end ) ) {
+					langs.push_back( &preDefinition.load() );
+					break;
+				}
+			} else if ( extension == ext ) {
+				langs.push_back( &preDefinition.load() );
+				break;
+			}
+		}
+	}
+
 	return langs;
 }
 
@@ -1091,7 +1135,7 @@ bool SyntaxDefinitionManager::extensionCanRepresentManyLanguages( std::string ex
 	if ( extension[0] != '.' )
 		extension = '.' + extension;
 
-	int count = 0;
+	std::unordered_set<std::string> count;
 	for ( const auto& definition : mDefinitions ) {
 		for ( const auto& ext : definition.getFiles() ) {
 			if ( String::startsWith( ext, "%." ) || String::startsWith( ext, "^" ) ||
@@ -1099,17 +1143,41 @@ bool SyntaxDefinitionManager::extensionCanRepresentManyLanguages( std::string ex
 				LuaPattern words( ext );
 				int start, end;
 				if ( words.find( extension, start, end ) ) {
-					count++;
-					if ( count > 1 )
+					count.insert( definition.getLanguageName() );
+					if ( count.size() > 1 )
 						return true;
+					break;
 				}
 			} else if ( extension == ext ) {
-				count++;
-				if ( count > 1 )
+				count.insert( definition.getLanguageName() );
+				if ( count.size() > 1 )
 					return true;
+				break;
 			}
 		}
 	}
+
+	for ( const auto& preDefinition : mPreDefinitions ) {
+		for ( const auto& ext : preDefinition.getFiles() ) {
+			if ( String::startsWith( ext, "%." ) || String::startsWith( ext, "^" ) ||
+				 String::endsWith( ext, "$" ) ) {
+				LuaPattern words( ext );
+				int start, end;
+				if ( words.find( extension, start, end ) ) {
+					count.insert( preDefinition.getLanguageName() );
+					if ( count.size() > 1 )
+						return true;
+					break;
+				}
+			} else if ( extension == ext ) {
+				count.insert( preDefinition.getLanguageName() );
+				if ( count.size() > 1 )
+					return true;
+				break;
+			}
+		}
+	}
+
 	return false;
 }
 
@@ -1169,6 +1237,37 @@ const SyntaxDefinition& SyntaxDefinitionManager::getByExtension( const std::stri
 				}
 			}
 		}
+
+		for ( const auto& preDefinition : mPreDefinitions ) {
+			for ( const auto& ext : preDefinition.getFiles() ) {
+				if ( String::startsWith( ext, "%." ) || String::startsWith( ext, "^" ) ||
+					 String::endsWith( ext, "$" ) ) {
+					LuaPattern words( ext );
+					int start, end;
+					if ( words.find( fileName, start, end ) ) {
+						if ( hFileAsCPP && preDefinition.getLSPName() == "c" && ext == "%.h$" )
+							return getByLSPName( "cpp" );
+
+						if ( extHasMultipleLangs && !preDefinition.hasExtensionPriority() ) {
+							def = &preDefinition.load();
+							continue;
+						}
+
+						return preDefinition.load();
+					}
+				} else if ( extension == ext ) {
+					if ( hFileAsCPP && preDefinition.getLSPName() == "c" && ext == ".h" )
+						return getByLSPName( "cpp" );
+
+					if ( extHasMultipleLangs && !preDefinition.hasExtensionPriority() ) {
+						def = &preDefinition.load();
+						continue;
+					}
+
+					return preDefinition.load();
+				}
+			}
+		}
 	}
 
 	return def != nullptr ? *def : mDefinitions[0];
@@ -1187,6 +1286,17 @@ const SyntaxDefinition& SyntaxDefinitionManager::getByHeader( const std::string&
 				}
 			}
 		}
+
+		for ( auto preDefinition = mPreDefinitions.rbegin();
+			  preDefinition != mPreDefinitions.rend(); ++preDefinition ) {
+			for ( const auto& hdr : preDefinition->getHeaders() ) {
+				LuaPattern words( hdr );
+				int start, end;
+				if ( words.find( header, start, end ) ) {
+					return preDefinition->load();
+				}
+			}
+		}
 	}
 	return mDefinitions[0];
 }
@@ -1222,8 +1332,4 @@ std::size_t SyntaxDefinitionManager::count() const {
 	return mDefinitions.size();
 }
 
-void SyntaxDefinitionManager::reserveSpaceForLanguages( std::size_t totalLangs ) {
-	mDefinitions.reserve( totalLangs );
-}
-
 }}} // namespace EE::UI::Doc

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ada.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addAda() {
+SyntaxDefinition& addAda() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -115,6 +115,7 @@ void addAda() {
 		} );
 
 	sd.setCaseInsensitive( true );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ada.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_ADA
 #define EE_UI_DOC_ADA
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addAda();
+extern SyntaxDefinition& addAda();
 
 }}}}
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/adept.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addAdept() {
+SyntaxDefinition& addAdept() {
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 		{ "Adept",
 		  { "%.adept$" },
@@ -150,6 +150,7 @@ void addAdept() {
 		  "//" } );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/adept.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_ADEPT
 #define EE_UI_DOC_ADEPT
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addAdept();
+extern SyntaxDefinition& addAdept();
 
 }}}}
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/angelscript.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addAngelScript() {
+SyntaxDefinition& addAngelScript() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -57,6 +57,8 @@ void addAngelScript() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/angelscript.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Angelscript
 #define EE_UI_DOC_Angelscript
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addAngelScript();
+extern SyntaxDefinition& addAngelScript();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/awkscript.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addAwkScript() {
+SyntaxDefinition& addAwkScript() {
 
-	SyntaxDefinitionManager::instance()->add(
+	return SyntaxDefinitionManager::instance()->add(
 
 		{ "Awk Script",
 		  { "%.awk$" },

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/awkscript.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_AWKSCRIPT
 #define EE_UI_DOC_AWKSCRIPT
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addAwkScript();
+extern SyntaxDefinition& addAwkScript();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/batchscript.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addBatchScript() {
+SyntaxDefinition& addBatchScript() {
 
-	SyntaxDefinitionManager::instance()->add(
+	return SyntaxDefinitionManager::instance()->add(
 
 		{ "Batch Script",
 		  { "%.bat$", "%.cmd$" },

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/batchscript.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Batchscript
 #define EE_UI_DOC_Batchscript
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addBatchScript();
+extern SyntaxDefinition& addBatchScript();
 
 }}}}
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/bazel.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addBazel() {
+SyntaxDefinition& addBazel() {
 
-	SyntaxDefinitionManager::instance()->add(
+	return SyntaxDefinitionManager::instance()->add(
 
 		{ "Bazel",
 		  { "%.bazel$", "%.bzl$", "BUILD" },

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/bazel.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Bazel
 #define EE_UI_DOC_Bazel
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addBazel();
+extern SyntaxDefinition& addBazel();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/bend.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addBend() {
+SyntaxDefinition& addBend() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -51,6 +51,7 @@ void addBend() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Indentation );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/bend.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Bend
 #define EE_UI_DOC_Bend
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addBend();
+extern SyntaxDefinition& addBend();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/blade.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addBlade() {
+SyntaxDefinition& addBlade() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -44,6 +44,7 @@ void addBlade() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/blade.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Blade
 #define EE_UI_DOC_Blade
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addBlade();
+extern SyntaxDefinition& addBlade();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/blueprint.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addBlueprint() {
+SyntaxDefinition& addBlueprint() {
 
-	SyntaxDefinitionManager::instance()->add(
+	return SyntaxDefinitionManager::instance()->add(
 
 		{ "Blueprint",
 		  { "%.blp$" },

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/blueprint.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Blueprint
 #define EE_UI_DOC_Blueprint
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addBlueprint();
+extern SyntaxDefinition& addBlueprint();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/brainfuck.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addBrainfuck() {
+SyntaxDefinition& addBrainfuck() {
 
-	SyntaxDefinitionManager::instance()->add(
+	return SyntaxDefinitionManager::instance()->add(
 
 		{ "Brainfuck",
 		  { "%.bf$" },

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/brainfuck.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Brainfuck
 #define EE_UI_DOC_Brainfuck
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addBrainfuck();
+extern SyntaxDefinition& addBrainfuck();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/buzz.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addBuzz() {
+SyntaxDefinition& addBuzz() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -48,6 +48,7 @@ void addBuzz() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/buzz.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Buzz
 #define EE_UI_DOC_Buzz
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addBuzz();
+extern SyntaxDefinition& addBuzz();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/c3.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addC3() {
+SyntaxDefinition& addC3() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -215,6 +215,7 @@ void addC3() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/c3.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_C3
 #define EE_UI_DOC_C3
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addC3();
+extern SyntaxDefinition& addC3();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/carbon.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addCarbon() {
+SyntaxDefinition& addCarbon() {
 	// Based in Lite-XL Rohan Vashisht implementation
 	// https://github.com/RohanVashisht1234/carbon_syntax_highlighter_lite-xl
 	auto& sd = SyntaxDefinitionManager::instance()->add(
@@ -54,6 +54,7 @@ void addCarbon() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/carbon.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Carbon
 #define EE_UI_DOC_Carbon
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addCarbon();
+extern SyntaxDefinition& addCarbon();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/clojure.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addClojure() {
+SyntaxDefinition& addClojure() {
 
-	SyntaxDefinitionManager::instance()->add(
+	return SyntaxDefinitionManager::instance()->add(
 
 		{ "Clojure",
 		  { "%.clj$", "%.cljs$", "%.clc$", "%.edn$" },

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/clojure.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Clojure
 #define EE_UI_DOC_Clojure
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addClojure();
+extern SyntaxDefinition& addClojure();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/cmake.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addCMake() {
+SyntaxDefinition& addCMake() {
 
-	SyntaxDefinitionManager::instance()->add(
+	return SyntaxDefinitionManager::instance()->add(
 
 		{ "CMake",
 		  { "%.cmake$", "CMakeLists%.txt$" },

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/cmake.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Cmake
 #define EE_UI_DOC_Cmake
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addCMake();
+extern SyntaxDefinition& addCMake();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/containerfile.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addContainerFile() {
+SyntaxDefinition& addContainerFile() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -43,6 +43,7 @@ void addContainerFile() {
 		  "dockerfile" } );
 
 	sd.setFoldRangeType( FoldRangeType::Indentation );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/containerfile.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Containerfile
 #define EE_UI_DOC_Containerfile
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addContainerFile();
+extern SyntaxDefinition& addContainerFile();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/covscript.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addCovScript() {
+SyntaxDefinition& addCovScript() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -61,6 +61,7 @@ void addCovScript() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Indentation );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/covscript.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Covscript
 #define EE_UI_DOC_Covscript
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addCovScript();
+extern SyntaxDefinition& addCovScript();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/crystal.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addCrystal() {
+SyntaxDefinition& addCrystal() {
 
-	SyntaxDefinitionManager::instance()->add(
+	return SyntaxDefinitionManager::instance()->add(
 
 		{ "Crystal",
 		  { "%.cr$" },

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/crystal.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Crystal
 #define EE_UI_DOC_Crystal
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addCrystal();
+extern SyntaxDefinition& addCrystal();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/csharp.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addCSharp() {
+SyntaxDefinition& addCSharp() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -66,6 +66,7 @@ void addCSharp() {
 		  "csharp" } );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/csharp.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Csharp
 #define EE_UI_DOC_Csharp
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addCSharp();
+extern SyntaxDefinition& addCSharp();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/d.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addD() {
+SyntaxDefinition& addD() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -145,6 +145,7 @@ void addD() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/d.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_D
 #define EE_UI_DOC_D
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addD();
+extern SyntaxDefinition& addD();
 
 }}}}
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/dart.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addDart() {
+SyntaxDefinition& addDart() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -49,6 +49,7 @@ void addDart() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/dart.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Dart
 #define EE_UI_DOC_Dart
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addDart();
+extern SyntaxDefinition& addDart();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/difffile.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addDiff() {
+SyntaxDefinition& addDiff() {
 
-	SyntaxDefinitionManager::instance()->add(
+	return SyntaxDefinitionManager::instance()->add(
 
 		{ "Diff File",
 		  { "%.diff$", "%.patch$" },

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/difffile.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Difffile
 #define EE_UI_DOC_Difffile
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addDiff();
+extern SyntaxDefinition& addDiff();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/elena.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addElena() {
+SyntaxDefinition& addElena() {
 
-	SyntaxDefinitionManager::instance()
+	return SyntaxDefinitionManager::instance()
 		->add(
 
 			{ "ELENA",

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/elena.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Elena
 #define EE_UI_DOC_Elena
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addElena();
+extern SyntaxDefinition& addElena();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/elixir.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addElixir() {
+SyntaxDefinition& addElixir() {
 
-	SyntaxDefinitionManager::instance()->add(
+	return SyntaxDefinitionManager::instance()->add(
 
 		{ "Elixir",
 		  { "%.ex$", "%.exs$" },

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/elixir.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Elixir
 #define EE_UI_DOC_Elixir
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addElixir();
+extern SyntaxDefinition& addElixir();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/elm.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addElm() {
+SyntaxDefinition& addElm() {
 
-	SyntaxDefinitionManager::instance()->add(
+	return SyntaxDefinitionManager::instance()->add(
 
 		{ "Elm",
 		  { "%.elm$" },

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/elm.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Elm
 #define EE_UI_DOC_Elm
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addElm();
+extern SyntaxDefinition& addElm();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/environmentfile.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addEnvironmentFile() {
+SyntaxDefinition& addEnvironmentFile() {
 
-	SyntaxDefinitionManager::instance()->add(
+	return SyntaxDefinitionManager::instance()->add(
 
 		{ "Environment File",
 		  { "%.env$", "%.env.[%w%-%_]*$" },

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/environmentfile.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Environmentfile
 #define EE_UI_DOC_Environmentfile
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addEnvironmentFile();
+extern SyntaxDefinition& addEnvironmentFile();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fantom.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addFantom() {
+SyntaxDefinition& addFantom() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -116,6 +116,7 @@ void addFantom() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fantom.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Fantom
 #define EE_UI_DOC_Fantom
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addFantom();
+extern SyntaxDefinition& addFantom();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fennel.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addFennel() {
+SyntaxDefinition& addFennel() {
 
-	SyntaxDefinitionManager::instance()->add(
+	return SyntaxDefinitionManager::instance()->add(
 
 		{ "Fennel",
 		  { "%.fnl$" },

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fennel.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Fennel
 #define EE_UI_DOC_Fennel
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addFennel();
+extern SyntaxDefinition& addFennel();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fixscript.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addFixScript() {
+SyntaxDefinition& addFixScript() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -58,6 +58,7 @@ void addFixScript() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fixscript.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_FixScript
 #define EE_UI_DOC_FixScript
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addFixScript();
+extern SyntaxDefinition& addFixScript();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/flow9.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addFlow9() {
+SyntaxDefinition& addFlow9() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -37,6 +37,7 @@ void addFlow9() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/flow9.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Flow9
 #define EE_UI_DOC_Flow9
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addFlow9();
+extern SyntaxDefinition& addFlow9();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fortran.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addFortran() {
+SyntaxDefinition& addFortran() {
 	// Based in Lite-XL Rohan Vashisht implementation
 	// https://github.com/RohanVashisht1234/fortran_syntax_highlighter_lite-xl
 	auto& sd = SyntaxDefinitionManager::instance()->add(
@@ -60,6 +60,7 @@ void addFortran() {
 		} );
 	sd.setCaseInsensitive( true );
 	sd.setFoldRangeType( FoldRangeType::Indentation );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fortran.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Fortran
 #define EE_UI_DOC_Fortran
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addFortran();
+extern SyntaxDefinition& addFortran();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fstab.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addFstab() {
+SyntaxDefinition& addFstab() {
 
-	SyntaxDefinitionManager::instance()->add(
+	return SyntaxDefinitionManager::instance()->add(
 
 		{ "fstab",
 		  { "fstab" },

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fstab.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Fstab
 #define EE_UI_DOC_Fstab
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addFstab();
+extern SyntaxDefinition& addFstab();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/gdscript.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addGDScript() {
+SyntaxDefinition& addGDScript() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -104,6 +104,7 @@ void addGDScript() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Indentation );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/gdscript.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Gdscript
 #define EE_UI_DOC_Gdscript
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addGDScript();
+extern SyntaxDefinition& addGDScript();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/gleam.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addGleam() {
+SyntaxDefinition& addGleam() {
 
-	SyntaxDefinitionManager::instance()
+	return SyntaxDefinitionManager::instance()
 		->add(
 
 			{ "Gleam",

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/gleam.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Gleam
 #define EE_UI_DOC_Gleam
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addGleam();
+extern SyntaxDefinition& addGleam();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/glsl.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addGLSL() {
+SyntaxDefinition& addGLSL() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -370,6 +370,7 @@ void addGLSL() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/glsl.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Glsl
 #define EE_UI_DOC_Glsl
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addGLSL();
+extern SyntaxDefinition& addGLSL();
 
 }}}}
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/go.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addGo() {
+SyntaxDefinition& addGo() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -58,6 +58,7 @@ void addGo() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/go.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Go
 #define EE_UI_DOC_Go
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addGo();
+extern SyntaxDefinition& addGo();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/graphql.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addGraphQL() {
+SyntaxDefinition& addGraphQL() {
 
-	SyntaxDefinitionManager::instance()->add(
+	return SyntaxDefinitionManager::instance()->add(
 
 		{ "GraphQL",
 		  { "%.graphql$", "%.gql$" },

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/graphql.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Graphql
 #define EE_UI_DOC_Graphql
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addGraphQL();
+extern SyntaxDefinition& addGraphQL();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/groovy.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addGroovy() {
+SyntaxDefinition& addGroovy() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -107,6 +107,7 @@ void addGroovy() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/groovy.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Groovy
 #define EE_UI_DOC_Groovy
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addGroovy();
+extern SyntaxDefinition& addGroovy();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/hare.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addHare() {
+SyntaxDefinition& addHare() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -64,6 +64,7 @@ void addHare() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/hare.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Hare
 #define EE_UI_DOC_Hare
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addHare();
+extern SyntaxDefinition& addHare();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/haskell.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addHaskell() {
+SyntaxDefinition& addHaskell() {
 
-	SyntaxDefinitionManager::instance()->add(
+	return SyntaxDefinitionManager::instance()->add(
 
 		{ "Haskell",
 		  { "%.hs$" },

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/haskell.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Haskell
 #define EE_UI_DOC_Haskell
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addHaskell();
+extern SyntaxDefinition& addHaskell();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/haxe.cpp

@@ -3,18 +3,19 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addHaxe() {
+SyntaxDefinition& addHaxe() {
 
-	SyntaxDefinitionManager::instance()->add(
-		{ "Haxe Compiler Arguments",
-		  { "%.hxml$" },
-		  {
-			  { { "#.*" }, "comment" },
-			  { { "%-[%-%w_]*" }, "keyword" },
-			  { { "(%.)(%u[%w_]*)" }, { "normal", "normal", "keyword2" } },
-		  },
-		  {},
-		  "#" } );
+	SyntaxDefinitionManager::instance()
+		->add( { "Haxe Compiler Arguments",
+				 { "%.hxml$" },
+				 {
+					 { { "#.*" }, "comment" },
+					 { { "%-[%-%w_]*" }, "keyword" },
+					 { { "(%.)(%u[%w_]*)" }, { "normal", "normal", "keyword2" } },
+				 },
+				 {},
+				 "#" } )
+		.setVisible( false );
 
 	SyntaxDefinitionManager::instance()
 		->add( { "HaxeStringInterpolation",
@@ -37,7 +38,7 @@ void addHaxe() {
 				 {} } )
 		.setVisible( false );
 
-	SyntaxDefinitionManager::instance()->add(
+	return SyntaxDefinitionManager::instance()->add(
 		{ "Haxe",
 		  { "%.hx$" },
 		  {

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/haxe.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Haxe
 #define EE_UI_DOC_Haxe
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addHaxe();
+extern SyntaxDefinition& addHaxe();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/hlsl.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addHLSL() {
+SyntaxDefinition& addHLSL() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -266,6 +266,7 @@ void addHLSL() {
 		  "//" } );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/hlsl.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_HLSL
 #define EE_UI_DOC_HLSL
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addHLSL();
+extern SyntaxDefinition& addHLSL();
 
 }}}}
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/htaccess.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addHtaccessFile() {
+SyntaxDefinition& addHtaccessFile() {
 
-	SyntaxDefinitionManager::instance()->add(
+	return SyntaxDefinitionManager::instance()->add(
 		{ ".htaccess",
 		  { "^%.htaccess$" },
 		  {

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/htaccess.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_htaccess
 #define EE_UI_DOC_htaccess
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addHtaccessFile();
+extern SyntaxDefinition& addHtaccessFile();
 
 }}}}
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ignorefile.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addIgnoreFile() {
+SyntaxDefinition& addIgnoreFile() {
 
-	SyntaxDefinitionManager::instance()->add(
+	return SyntaxDefinitionManager::instance()->add(
 
 		{ ".ignore file",
 		  { "%..*ignore$" },

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ignorefile.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Ignorefile
 #define EE_UI_DOC_Ignorefile
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addIgnoreFile();
+extern SyntaxDefinition& addIgnoreFile();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ispc.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addISPC() {
+SyntaxDefinition& addISPC() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -143,6 +143,7 @@ void addISPC() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ispc.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_ISPC
 #define EE_UI_DOC_ISPC
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addISPC();
+extern SyntaxDefinition& addISPC();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/jai.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addJai() {
+SyntaxDefinition& addJai() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -61,6 +61,7 @@ void addJai() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/jai.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Jai
 #define EE_UI_DOC_Jai
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addJai();
+extern SyntaxDefinition& addJai();
 
 }}}}
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/janet.cpp

@@ -3,9 +3,9 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addJanet() {
+SyntaxDefinition& addJanet() {
 
-	SyntaxDefinitionManager::instance()
+	return SyntaxDefinitionManager::instance()
 		->add(
 
 			{ "Janet",

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/janet.hpp

@@ -1,9 +1,11 @@
 #ifndef EE_UI_DOC_Janet
 #define EE_UI_DOC_Janet
 
+#include <eepp/ui/doc/syntaxdefinition.hpp>
+
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-extern void addJanet();
+extern SyntaxDefinition& addJanet();
 
 }}}} // namespace EE::UI::Doc::Language
 

src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/java.cpp

@@ -3,7 +3,7 @@
 
 namespace EE { namespace UI { namespace Doc { namespace Language {
 
-void addJava() {
+SyntaxDefinition& addJava() {
 
 	auto& sd = SyntaxDefinitionManager::instance()->add(
 
@@ -60,6 +60,7 @@ void addJava() {
 		} );
 
 	sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } );
+	return sd;
 }
 
 }}}} // namespace EE::UI::Doc::Language