paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-06 05:58:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Jedi code format: Fix bug when obfuscating only selected text.

Browse Source 
(cherry picked from commit 2b70328d5d)
This commit is contained in:
DomingoGP 2024-07-07 19:17:03 +02:00
parent 57f4185083
commit 323d21fc92
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/jcf2/Process/Obfuscate/RemoveComment.pas
View File

@ -49,7 +49,7 @@ implementation
uses
JcfStringUtils,
SourceToken, Tokens, ParseTreeNodeType, FormatFlags;
SourceToken, Tokens, ParseTreeNodeType, FormatFlags, Converter;
function CommentMustStay(const pc: TSourceToken): boolean;
var
@ -77,6 +77,9 @@ begin
(StrLeft(pc.SourceCode, FORMAT_COMMENT_PREFIX_LEN) = FORMAT_COMMENT_PREFIX)) then
Result := True;
// these comments are used to process only selected text.
if (pc.CommentStyle in CURLY_COMMENTS) and ((pc.SourceCode = FORMAT_START) or (pc.SourceCode = FORMAT_END)) then
Result := True;
end;
constructor TRemoveComment.Create;

7
components/jcf2/ReadWrite/Converter.pas
View File

@ -106,6 +106,10 @@ type
property ShowTree: boolean Read fbShowParseTree Write fbShowParseTree;
end;
const
FORMAT_START = '{<JCF_!*$>}';
FORMAT_END = '{</JCF_!*$>}';
implementation
uses
@ -371,9 +375,6 @@ end;
procedure TConverter.ConvertPart(const piStartIndex, piEndIndex: Integer;
aOnlyOutputSelection: boolean);
const
FORMAT_START = '{<JCF_!*$>}';
FORMAT_END = '{</JCF_!*$>}';
var
liRealInputStart, liRealInputEnd: Integer;
liOutputStart, liOutputEnd: Integer;