Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to Scintilla 5.3.3 and Lexilla 5.2.2 #13082

Closed
wants to merge 1 commit into from
Closed

Update to Scintilla 5.3.3 and Lexilla 5.2.2 #13082

wants to merge 1 commit into from

Conversation

chcg
Copy link
Contributor

@chcg chcg commented Feb 9, 2023 •
edited
Loading

update to https://www.scintilla.org/scintilla533.zip with:

Released 8 February 2023.
Fix SCI_LINESJOIN bug where carriage returns were incorrectly retained. Bug #2372.
Fix SCI_VERTICALCENTRECARET to update the vertical scroll position.
When an autocompletion list is shown in response to SCN_CHARADDED, do not process character as fill-up or stop. This avoids closing immediately when a character may both trigger and finish autocompletion.
On Cocoa fix character input bug where dotless 'i' and some other extended Latin characters could not be entered. The change also stops SCI_ASSIGNCMDKEY from working with these characters on Cocoa. Bug #2374.
On GTK, support IME context. Feature #1476.
On GTK on Win32, fix scrolling speed to not be too fast. Bug #2375.
On Qt, fix indicator drawing past left of text pane over margin. Bug #2373, Bug #1956.
On Qt, allow scrolling with mouse wheel when scroll bar hidden.

and https://www.scintilla.org/lexilla522.zip with

Released 8 February 2023.
C++: Fix keywords that start with non-ASCII. Also affects other lexers. Issue #130.
Matlab: Include more prefix and suffix characters in numeric literals. Issue #120.
Matlab: More accurate treatment of line ends inside strings. Matlab and Octave are different here. Issue #18.
Modula-3: Don't treat identifier suffix that matches keyword as keyword. Issue #129.
Modula-3: Fix endless loop in folder. Issue #128.
Modula-3: Fix access to lines beyond document end in folder. Issue #131.
Python: Don't highlight match and case as keywords in contexts where they probably aren't used as keywords. Pull request #122.
X12: Support empty envelopes. Bug #2369.
  • update CMakeLists.txt to latest changes within vcxproj file

@chcg chcg added build / code scintilla dependent Can't be considered for N++ implementation unless/until Scintilla changes labels Feb 9, 2023
@Yaron10
Copy link

Yaron10 commented Feb 10, 2023

@chcg,

#12219.

Thank you.

@chcg
Copy link
Contributor Author

chcg commented Feb 10, 2023

@Yaron10 Thanks for finding this merge issue. Fixed.

@Yaron10
Copy link

Yaron10 commented Feb 10, 2023

@chcg,

Great. 👍
Thank you.

ozone10
ozone10 reviewed Feb 10, 2023
View reviewed changes
PowerEditor/src/CMakeLists.txt Outdated
@@ -385,13 +385,13 @@ IF (WIN32)
if ( MSVC )
#do not use for mingw builds
SET(CMAKE_CXX_FLAGS "/EHa /MP /W4")
SET(defs -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0600 -D_USE_64BIT_TIME_T -DTIXML_USE_STL -DTIXMLA_USE_STL -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NON_CONFORMING_SWPRINTFS )
SET(defs -DUNICODE -D_UNICODE -D_WIN32_WINNT=_WIN32_WINNT_VISTA -D_USE_64BIT_TIME_T -DTIXML_USE_STL -DTIXMLA_USE_STL -DNOMINMAX -DOEMRESOURCE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NON_CONFORMING_SWPRINTFS -D_CRT_NON_CONFORMING_WCSTOK -D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING )
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chcg
Just a question. Are both -D_CRT_NON_CONFORMING_SWPRINTFS and -D_CRT_NON_CONFORMING_WCSTOK needed? Notepad++ msvc builds don't use these macros anymore.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ozone10 Thanks. No, should be inline with the settings of the visual studio build. Corrected.

@chcg
Update to Scintilla 5.3.3 and Lexilla 5.2.2
73c7cde 
update to https://www.scintilla.org/scintilla533.zip with:

    Released 8 February 2023.
    Fix SCI_LINESJOIN bug where carriage returns were incorrectly retained. Bug notepad-plus-plus#2372.
    Fix SCI_VERTICALCENTRECARET to update the vertical scroll position.
    When an autocompletion list is shown in response to SCN_CHARADDED, do not process character as fill-up or stop. This avoids closing immediately when a character may both trigger and finish autocompletion.
    On Cocoa fix character input bug where dotless 'i' and some other extended Latin characters could not be entered. The change also stops SCI_ASSIGNCMDKEY from working with these characters on Cocoa. Bug notepad-plus-plus#2374.
    On GTK, support IME context. Feature notepad-plus-plus#1476.
    On GTK on Win32, fix scrolling speed to not be too fast. Bug notepad-plus-plus#2375.
    On Qt, fix indicator drawing past left of text pane over margin. Bug notepad-plus-plus#2373, Bug notepad-plus-plus#1956.
    On Qt, allow scrolling with mouse wheel when scroll bar hidden.

and https://www.scintilla.org/lexilla522.zip with

    Released 8 February 2023.
    C++: Fix keywords that start with non-ASCII. Also affects other lexers. Issue notepad-plus-plus#130.
    Matlab: Include more prefix and suffix characters in numeric literals. Issue notepad-plus-plus#120.
    Matlab: More accurate treatment of line ends inside strings. Matlab and Octave are different here. Issue notepad-plus-plus#18.
    Modula-3: Don't treat identifier suffix that matches keyword as keyword. Issue notepad-plus-plus#129.
    Modula-3: Fix endless loop in folder. Issue notepad-plus-plus#128.
    Modula-3: Fix access to lines beyond document end in folder. Issue notepad-plus-plus#131.
    Python: Don't highlight match and case as keywords in contexts where they probably aren't used as keywords. Pull request notepad-plus-plus#122.
    X12: Support empty envelopes. Bug notepad-plus-plus#2369.

update CMakeLists.txt to latest changes within vcxproj file
@donho donho self-assigned this Feb 12, 2023
@donho donho added the accepted label Feb 12, 2023
@donho donho closed this in 43182e1 Feb 12, 2023
@chcg chcg deleted the scintilla_533 branch February 12, 2023 17:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ozone10 ozone10 ozone10 left review comments

Assignees

@donho donho

Labels
accepted build / code scintilla dependent Can't be considered for N++ implementation unless/until Scintilla changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@chcg @Yaron10 @ozone10 @donho