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

ecode: More XML Tools plugin fixes.

Browse Source
This commit is contained in:
Martín Lucas Golini
2023-07-11 17:49:01 -03:00
parent c2e8a55bfa
commit f9ead38c9c
7 changed files with 81 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/eepp/ui/doc/syntaxdefinitionmanager.cpp
+1
View File
@@ -1931,6 +1931,7 @@ static void addxit() {
{ { "^%[x%]%s" }, "function" },
{ { "^%[@%]%s" }, "keyword" },
{ { "^%[~%]%s" }, "comment" },
{ { "^%[%?%]%s" }, "warning" },
{ { "^[%wñàáâãäåèéêëìíîïòóôõöùúûüýÿÑÀÁÂÃÄÅÈÉÊËÌÍÎÏÒÓÔÕÖÙÚÛÜÝ][%w"
"ñàáâãäåèéêëìíîïòóôõöùúûüýÿÑÀÁÂÃÄÅÈÉÊËÌÍÎÏÒÓÔÕÖÙÚÛÜÝ%s%p]*%f[\n]" },
"underline" },
src/tools/ecode/plugins/autocomplete/autocompleteplugin.cpp
+1 -1
View File
@@ -143,7 +143,7 @@ void AutoCompletePlugin::onRegister( UICodeEditor* editor ) {
const DocSyntaxDefEvent* event = static_cast<const DocSyntaxDefEvent*>( ev );
std::string oldLang = event->getOldLang();
std::string newLang = event->getNewLang();
#if AUTO_COMPLETE_THREADED
#if defined( AUTO_COMPLETE_THREADED ) && AUTO_COMPLETE_THREADED == 1
mThreadPool->run( [&, oldLang, newLang] {
updateLangCache( oldLang );
updateLangCache( newLang );
src/tools/ecode/plugins/formatter/formatterplugin.cpp
+1 -1
View File
@@ -37,7 +37,7 @@ FormatterPlugin::FormatterPlugin( PluginManager* pluginManager, bool sync ) :
if ( sync ) {
load( pluginManager );
} else {
#if FORMATTER_THREADED
#if defined( FORMATTER_THREADED ) && FORMATTER_THREADED == 1
mThreadPool->run( [&, pluginManager] { load( pluginManager ); } );
#else
load( pluginManager );
src/tools/ecode/plugins/linter/linterplugin.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ LinterPlugin::LinterPlugin( PluginManager* pluginManager, bool sync ) : Plugin(
if ( sync ) {
load( pluginManager );
} else {
#if LINTER_THREADED
#if defined( LINTER_THREADED ) && LINTER_THREADED == 1
mThreadPool->run( [&, pluginManager] { load( pluginManager ); } );
#else
load( pluginManager );
src/tools/ecode/plugins/lsp/lspclientplugin.cpp
+10
View File
@@ -18,6 +18,12 @@ using json = nlohmann::json;
namespace ecode {
#if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN || defined( __EMSCRIPTEN_PTHREADS__ )
#define LSPCLIENT_THREADED 1
#else
#define LSPCLIENT_THREADED 0
#endif
class LSPLocationModel : public Model {
public:
enum CustomInfo { URI, TextRange };
@@ -122,7 +128,11 @@ LSPClientPlugin::LSPClientPlugin( PluginManager* pluginManager, bool sync ) :
if ( sync ) {
load( pluginManager );
} else {
#if defined( LSPCLIENT_THREADED ) && LSPCLIENT_THREADED == 1
mThreadPool->run( [&, pluginManager] { load( pluginManager ); } );
#else
load( pluginManager );
#endif
}
}
src/tools/ecode/plugins/xmltools/xmltoolsplugin.cpp
+50 -46
View File
@@ -26,7 +26,7 @@ XMLToolsPlugin::XMLToolsPlugin( PluginManager* pluginManager, bool sync ) :
if ( sync ) {
load( pluginManager );
} else {
#if FORMATTER_THREADED
#if defined( XMLTOOLS_THREADED ) && XMLTOOLS_THREADED == 1
mThreadPool->run( [&, pluginManager] { load( pluginManager ); } );
#else
load( pluginManager );
@@ -98,7 +98,9 @@ void XMLToolsPlugin::load( PluginManager* pluginManager ) {
mConfigHash = String::hash( data );
}
mReady = true;
fireReadyCbs();
subscribeFileSystemListener();
}
@@ -146,6 +148,20 @@ static bool isClosedTag( TextDocument* doc, TextPosition start ) {
return false;
}
void XMLToolsPlugin::XMLToolsClient::updateCurrentMatch( XMLToolsPlugin::ClientMatch& match,
int translation ) {
TextRange& open = match.open();
TextRange& close = match.close();
if ( match.isSameLine() ) {
open.end().setColumn( open.end().column() + translation );
close.start().setColumn( close.start().column() + translation );
close.end().setColumn( close.end().column() + translation * 2 );
} else {
open.end().setColumn( open.end().column() + translation );
close.end().setColumn( close.end().column() + translation );
}
}
void XMLToolsPlugin::XMLToolsClient::onDocumentTextChanged(
const DocumentContentChange& docChange ) {
if ( mAutoInserting || !mParent->getAutoEditMatch() ||
@@ -153,70 +169,51 @@ void XMLToolsPlugin::XMLToolsClient::onDocumentTextChanged(
mDoc->getSelections().size() > 1 )
return;
ClientMatch& match = mParent->mMatches[mDoc];
if ( !match.currentBracket.contains( docChange.range ) )
if ( !match.currentBracket.contains( docChange.range ) && !mWaitingText )
return;
mAutoInserting = true;
mWaitingText = false;
auto sel = mDoc->getSelections();
auto diff = docChange.range.start() - match.currentBracket.start() +
( match.currentIsClose ? TextPosition( 0, 0 ) : TextPosition( 0, 1 ) );
( match.currentIsClose ? TextPosition( 0, -1 ) : TextPosition( 0, 1 ) );
auto translatedPos = match.matchBracket.normalize().start() + diff;
if ( match.currentIsClose ) {
translatedPos = mDoc->positionOffset( translatedPos, -1 );
}
mDoc->setSelection( 0, translatedPos );
auto translation =
docChange.range.normalized().end().column() - docChange.range.normalized().start().column();
updateCurrentMatch( match, translation * ( docChange.text.empty() ? -1 : 1 ) );
if ( docChange.text.empty() ) {
if ( match.currentBracket.start().line() == match.matchBracket.start().line() ) {
if ( !match.currentIsClose ) {
translatedPos = mDoc->positionOffset( translatedPos, -translation );
}
}
if ( match.isSameLine() && !match.currentIsClose )
translatedPos = mDoc->positionOffset( translatedPos, -translation );
mDoc->remove(
0, { translatedPos, { translatedPos.line(), translatedPos.column() + translation } } );
if ( match.isSameLine() && match.currentIsClose ) {
for ( auto& s : sel ) {
int amount = sel[0].start().column() > docChange.range.start().column() ? 2 : 1;
s.start().setColumn( s.start().column() - translation * amount );
s.setEnd( s.start() );
}
mForceSelections = 2;
mSelections = sel;
}
if ( mDoc->isInsertingText() ) {
mWaitingText = true;
} else {
TextRange range = match.currentIsClose ? match.currentBracket : match.matchBracket;
range.normalize();
if ( match.isSameLine() && !match.currentIsClose ) {
range.setStart( mDoc->positionOffset( range.start(), -translation + 1 ) );
}
auto closeText =
mDoc->getText( { range.start(), mDoc->positionOffset( range.start(), 3 ) } );
if ( closeText == "</>" ) {
auto closeText = mDoc->getText( { match.close() } );
if ( closeText == "</" )
mJustDeletedWholeWord = true;
if ( match.isSameLine() ) {
match.currentBracket = { match.currentBracket.start(),
mDoc->positionOffset( match.currentBracket.start(),
match.currentIsClose ? 2 : 1 ) };
match.matchBracket = {
match.matchBracket.start(),
mDoc->positionOffset( match.matchBracket.start(),
match.currentIsClose ? 1 : 1 - translation ) };
} else {
match.currentBracket = { match.currentBracket.start(),
mDoc->positionOffset( match.currentBracket.start(),
match.currentIsClose ? 2 : 1 ) };
match.matchBracket = { match.matchBracket.start(),
mDoc->positionOffset( match.matchBracket.start(),
match.currentIsClose ? 1 : 2 ) };
}
}
}
} else {
if ( match.isSameLine() && !match.currentIsClose ) {
if ( match.isSameLine() && !match.currentIsClose )
translatedPos =
mDoc->positionOffset( translatedPos, translation + docChange.text.size() );
}
mDoc->insert( 0, translatedPos, docChange.text );
mWaitingText = false;
if ( match.isSameLine() && match.currentIsClose ) {
for ( auto& s : sel ) {
s.start().setColumn( s.start().column() + docChange.text.size() * 2 + 1 );
s.end().setColumn( s.end().column() + docChange.text.size() * 2 + 1 );
s.start().setColumn( s.start().column() + docChange.text.size() * 2 );
s.end().setColumn( s.end().column() + docChange.text.size() * 2 );
}
mForceSelections = true;
mForceSelections = 2;
mSelections = sel;
}
}
@@ -268,7 +265,7 @@ void XMLToolsPlugin::XMLToolsClient::updateMatch( const TextRange& sel ) {
}
if ( found.isValid() ) {
ClientMatch match{ range, found, isCloseBracket };
ClientMatch match{ range.normalized(), found.normalized(), isCloseBracket };
mParent->mMatches[mDoc] = std::move( match );
} else {
clearMatch();
@@ -276,12 +273,19 @@ void XMLToolsPlugin::XMLToolsClient::updateMatch( const TextRange& sel ) {
}
void XMLToolsPlugin::XMLToolsClient::onDocumentSelectionChange( const TextRange& sel ) {
if ( mForceSelections ) {
mDoc->setSelection( mSelections );
mForceSelections = false;
if ( mForceSelections > 0 ) {
if ( --mForceSelections == 0 ) {
mDoc->setSelection( mSelections );
mForceSelections = false;
return;
}
}
if ( mAutoInserting || mWaitingText )
if ( mWaitingText ) {
return;
}
if ( mAutoInserting ) {
return;
}
if ( mJustDeletedWholeWord ) {
mJustDeletedWholeWord = false;
return;
src/tools/ecode/plugins/xmltools/xmltoolsplugin.hpp
+17 -10
View File
@@ -51,6 +51,20 @@ class XMLToolsPlugin : public PluginBase {
bool mAutoEditMatch{ true };
Mutex mClientsMutex;
struct ClientMatch {
TextRange currentBracket;
TextRange matchBracket;
bool currentIsClose;
bool isSameLine() const {
return currentBracket.start().line() == matchBracket.start().line();
}
TextRange& open() { return currentIsClose ? matchBracket : currentBracket; }
TextRange& close() { return currentIsClose ? currentBracket : matchBracket; }
};
class XMLToolsClient : public TextDocument::Client {
public:
explicit XMLToolsClient( XMLToolsPlugin* parent, TextDocument* doc ) :
@@ -74,25 +88,18 @@ class XMLToolsPlugin : public PluginBase {
bool mAutoInserting{ false };
bool mWaitingText{ false };
bool mJustDeletedWholeWord{ false };
bool mForceSelections{ false };
int mForceSelections{ 0 };
TextRanges mSelections;
void updateMatch( const TextRange& range );
void clearMatch();
void updateCurrentMatch( ClientMatch& match, int translation );
};
using ClientsMap = std::unordered_map<TextDocument*, std::unique_ptr<XMLToolsClient>>;
ClientsMap mClients;
struct ClientMatch {
TextRange currentBracket;
TextRange matchBracket;
bool currentIsClose;
bool isSameLine() const {
return currentBracket.start().line() == matchBracket.start().line();
}
};
using ClientsMatches = std::unordered_map<TextDocument*, ClientMatch>;
ClientsMatches mMatches;