opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-14 18:12:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

If previous word is preceded by a dot, it is most probably a table, column or some alias, so do not uppercase it then. Closes #494

Browse Source
This commit is contained in:
Ansgar Becker
2019-03-09 08:40:48 +01:00
parent d6c35d9474
commit 098c526b15
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/main.pas
View File

@ -6254,11 +6254,15 @@ var
OldCaretXY, StartOfTokenRowCol, CurrentRowCol: TBufferCoord;
TokenTypeInt, Start, CurrentCharIndex: Integer;
OldSelStart, OldSelEnd: Integer;
LineWithToken: String;
const
WordChars = ['A'..'Z', 'a'..'z', '_'];
IgnoreChars = [#8]; // Backspace, and probably more which should not trigger uppercase
begin
// Uppercase reserved words, functions and data types
if AppSettings.ReadBool(asAutoUppercase) and (not CharInSet(Key, WordChars)) then begin
if (not CharInSet(Key, WordChars)) and (not CharInSet(Key, IgnoreChars)) then begin
if not AppSettings.ReadBool(asAutoUppercase) then
Exit;
Editor := Sender as TSynMemo;
CurrentCharIndex := Editor.RowColToCharIndex(Editor.CaretXY);
// Go one left on trailing line feed, after which PrevWordPos doesn't work
@ -6266,6 +6270,11 @@ begin
CurrentRowCol := Editor.CharIndexToRowCol(CurrentCharIndex);
StartOfTokenRowCol := Editor.PrevWordPosEx(CurrentRowCol);
Editor.GetHighlighterAttriAtRowColEx(StartOfTokenRowCol, Token, TokenTypeInt, Start, Attri);
LineWithToken := Editor.Lines[StartOfTokenRowCol.Line-1];
if (StartOfTokenRowCol.Char > 1) and (LineWithToken[StartOfTokenRowCol.Char-1] = '.') then begin
// Previous word is preceded by a dot, so it is most probably a table, column or some alias
Exit;
end;
if SynSQLSynUsed.TableNames.IndexOf(Token) > 0 then
Exit;
if not (TtkTokenKind(TokenTypeInt) in [tkDatatype, tkFunction, tkKey]) then