Skip to content

Commit

Permalink
Remove workaround because of Scintilla 5.3.3 bugfix. ("When an autoco…
Browse files Browse the repository at this point in the history
…mpletion 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.")
  • Loading branch information
martijnlaan committed Jun 21, 2024
1 parent 0bed5b9 commit ace6fd9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ISHelp/isetup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3256,7 +3256,7 @@ Filename: "{win}\MYPROG.INI"; Section: "InstallSettings"; Key: "InstallPath"; St
<td>Complete word.</td><td>Ctrl+Space or Ctrl+I or Alt+Right (the last only if the Delphi key map is not active)</td>
</tr>
<tr>
<td>Fillup complete word.</td><td>Tab or Enter or Space (for ISPP directives) or \ (for constants) or : (for constants and section parameters) or ] (for sections) or = (for section directives).</td>
<td>Fillup complete word.</td><td>Tab or Enter or Space (for ISPP directives or Flags and Type parameters) or \ (for constants) or : (for constants and section parameters) or ] (for sections) or = (for section directives).</td>
</tr>
<tr>
<td>Cancel complete word.</td><td>Esc</td>
Expand Down
5 changes: 1 addition & 4 deletions Projects/Src/CompForm.pas
Original file line number Diff line number Diff line change
Expand Up @@ -4568,10 +4568,7 @@ procedure TCompileForm.InitiateAutoComplete(const Key: AnsiChar);
WordList := FMemosStyler.FlagsWordList[Section];
if WordList = '' then
Exit;
if Key <> ' ' then { Space initiating autocompletion also initiates a direct fillup if its a fillup char :( }
FActiveMemo.SetAutoCompleteFillupChars(' ')
else
FActiveMemo.SetAutoCompleteFillupChars('')
FActiveMemo.SetAutoCompleteFillupChars(' ');
end else begin
WordList := FMemosStyler.KeywordsWordList[Section];
if WordList = '' then { Messages & CustomMessages }
Expand Down

0 comments on commit ace6fd9

Please sign in to comment.