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

Minor fix, still not working properly.

Browse Source
This commit is contained in:
Martín Lucas Golini
2025-05-18 23:48:11 -03:00
parent 0fbebf6dfa
commit d71e33ff22
2 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/eepp/ui/doc/syntaxhighlighter.cpp
View File

@@ -131,8 +131,10 @@ void SyntaxHighlighter::setMaxTokenizationLength( const Int64& maxTokenizationLe
void SyntaxHighlighter::tokenizeAsync( std::shared_ptr<ThreadPool> pool,
const std::function<void()>& onDone ) {
#warning SyntaxHighlighter::tokenizeAsync is disabled
#ifndef EE_COMPILER_MSVC
#warning SyntaxHighlighter::tokenizeAsync is disabled
return;
#endif
if ( mTokenizeAsync )
return;
mTokenizeAsync = true;

50
src/eepp/ui/doc/syntaxtokenizer.cpp
View File

@@ -153,35 +153,29 @@ SyntaxStateRestored SyntaxTokenizer::retrieveSyntaxState( const SyntaxDefinition
const SyntaxState& state ) {
SyntaxStateRestored syntaxState{ &syntax, nullptr, state.state[0], 0 };
const SyntaxPattern* curPattern = nullptr;
if ( state.state[0].state > 0 &&
( state.state[1].state > 0 ||
( ( curPattern = syntax.getPatternFromState( state.state[0] ) ) &&
curPattern->hasSyntaxOrContentScope() ) ) ) {
for ( size_t i = 0; i < MAX_SUB_SYNTAXS - 1; ++i ) {
if ( i != 0 || curPattern == nullptr )
curPattern = syntaxState.currentSyntax->getPatternFromState( state.state[i] );
if ( curPattern && state.state[i].state != SYNTAX_TOKENIZER_STATE_NONE ) {
if ( curPattern->hasSyntaxOrContentScope() ) {
syntaxState.subsyntaxInfo = curPattern;
auto langIndex = state.langStack[i];
syntaxState.currentSyntax =
langIndex != 0
? &SyntaxDefinitionManager::instance()->getByLanguageIndex( langIndex )
: &SyntaxDefinitionManager::instance()->getByLanguageName(
syntaxState.subsyntaxInfo->syntax );
if ( curPattern->hasContentScope() ) {
syntaxState.currentPatternIdx = state.state[i];
syntaxState.currentLevel = i;
} else {
syntaxState.currentPatternIdx = {};
syntaxState.currentLevel++;
}
} else {
for ( size_t i = 0; i < MAX_SUB_SYNTAXS - 1; ++i ) {
curPattern = syntaxState.currentSyntax->getPatternFromState( state.state[i] );
if ( curPattern && state.state[i].state != SYNTAX_TOKENIZER_STATE_NONE ) {
if ( curPattern->hasSyntaxOrContentScope() ) {
syntaxState.subsyntaxInfo = curPattern;
auto langIndex = state.langStack[i];
syntaxState.currentSyntax =
langIndex != 0
? &SyntaxDefinitionManager::instance()->getByLanguageIndex( langIndex )
: &SyntaxDefinitionManager::instance()->getByLanguageName(
syntaxState.subsyntaxInfo->syntax );
if ( curPattern->hasContentScope() ) {
syntaxState.currentPatternIdx = state.state[i];
syntaxState.currentLevel = i;
} else {
syntaxState.currentPatternIdx = {};
syntaxState.currentLevel++;
}
} else {
break;
syntaxState.currentPatternIdx = state.state[i];
}
} else {
break;
}
}
return syntaxState;
@@ -234,12 +228,14 @@ static inline void popStack( SyntaxStateRestored& curState, SyntaxState& retStat
return;
}
retState.langStack[curState.currentLevel] = 0;
setSubsyntaxPatternIdx( curState, retState, SyntaxStateType{} );
if ( fromPattern.isSimpleRangedMatch() )
if ( fromPattern.isSimpleRangedMatch() ) {
curState = SyntaxTokenizer::retrieveSyntaxState( syntax, retState );
return;
}
retState.langStack[curState.currentLevel] = 0;
if ( curState.currentLevel > 0 )
curState.currentLevel--;