mirror of
				https://github.com/notepad-plus-plus/notepad-plus-plus.git
				synced 2025-10-31 11:34:05 +01:00 
			
		
		
		
	Update with https://www.scintilla.org/scintilla521.zip https://www.scintilla.org/lexilla515.zip - fix setting to bring Scintilla::PositionCR from ScintillaStructures.h inline with Sci_Position.h Sci_PositionCR - add workaround to enable lexer for searchResult commented out SCI_SETILEXER call on searchResult to get one result which is correctly handled by the lexer, added comment about the current problem with property @MarkingsStruct which seems to disappear after call to SCI_SETILEXER or CreateLexer - corrected usage of ObjC lexer - removed unnecessary filter stuff - use own sections for scintilla and lexilla build targets and allow parallel builds - as libscilex is no longer existing, changed to libscintilla - adapt makefiles and cmake - use VS2019 - started simple changes for createlexer adaptations, nullpointercheck missing on return of lexer name from deprecated LexerNameFromID -> undefined behaviour - movement from id -> lexer name, mostly done via LexerNameFromID + switching off corresponding compiler warning - changed to SCI_SETILEXER from SCI_SETLEXER, SCI_SETLEXERLANGUAGE needs to be corrected, see Scintilla5Migration.html - just commented out: SCI_LOADLEXERLIBRARY Fix #10504, close #11419
		
			
				
	
	
		
			78 lines
		
	
	
		
			1.7 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			78 lines
		
	
	
		
			1.7 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| /** @file testRESearch.cxx
 | |
|  ** Unit Tests for Scintilla internal data structures
 | |
|  **/
 | |
| 
 | |
| #include <cstddef>
 | |
| #include <cstring>
 | |
| #include <stdexcept>
 | |
| #include <string_view>
 | |
| #include <vector>
 | |
| #include <optional>
 | |
| #include <algorithm>
 | |
| #include <memory>
 | |
| 
 | |
| #include "ScintillaTypes.h"
 | |
| 
 | |
| #include "Debugging.h"
 | |
| 
 | |
| #include "Position.h"
 | |
| #include "SplitVector.h"
 | |
| #include "Partitioning.h"
 | |
| #include "RunStyles.h"
 | |
| #include "CellBuffer.h"
 | |
| #include "CharClassify.h"
 | |
| #include "RESearch.h"
 | |
| 
 | |
| #include "catch.hpp"
 | |
| 
 | |
| using namespace Scintilla;
 | |
| using namespace Scintilla::Internal;
 | |
| 
 | |
| class StringCI : public CharacterIndexer {
 | |
| 	std::string s;
 | |
| public:
 | |
| 	StringCI(std::string_view sv_) : s(sv_) {
 | |
| 	}
 | |
| 	Sci::Position Length() const noexcept {
 | |
| 		return s.length();
 | |
| 	}
 | |
| 	char CharAt(Sci::Position index) const override {
 | |
| 		return s.at(index);
 | |
| 	}
 | |
| };
 | |
| 
 | |
| // Test RESearch.
 | |
| 
 | |
| TEST_CASE("RESearch") {
 | |
| 
 | |
| 	CharClassify cc;
 | |
| 	const char sTextSpace[] = "Scintilla ";
 | |
| 	const char pattern[] = "[a-z]+";
 | |
| 
 | |
| 	SECTION("Compile") {
 | |
| 		std::unique_ptr<RESearch> re = std::make_unique<RESearch>(&cc);
 | |
| 		const char *msg = re->Compile(pattern, strlen(pattern), true, false);
 | |
| 		REQUIRE(nullptr == msg);
 | |
| 	}
 | |
| 
 | |
| 	SECTION("Execute") {
 | |
| 		std::unique_ptr<RESearch> re = std::make_unique<RESearch>(&cc);
 | |
| 		re->Compile(pattern, strlen(pattern), true, false);
 | |
| 		StringCI sci(sTextSpace);
 | |
| 		const int x = re->Execute(sci, 0, sci.Length());
 | |
| 		REQUIRE(x == 1);
 | |
| 		REQUIRE(re->bopat[0] == 1);
 | |
| 		REQUIRE(re->eopat[0] == sci.Length() - 1);
 | |
| 	}
 | |
| 
 | |
| 	SECTION("Grab") {
 | |
| 		std::unique_ptr<RESearch> re = std::make_unique<RESearch>(&cc);
 | |
| 		re->Compile(pattern, strlen(pattern), true, false);
 | |
| 		StringCI sci(sTextSpace);
 | |
| 		re->Execute(sci, 0, sci.Length());
 | |
| 		re->GrabMatches(sci);
 | |
| 		REQUIRE(re->pat[0] == "cintilla");
 | |
| 	}
 | |
| 
 | |
| }
 |