Skip to content

Fixed the issue bracket highlight incorrect when the symbol is under … #205

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed the issue bracket highlight incorrect when the symbol is under … #205

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
65 changes: 51 additions & 14 deletions Source/EditorOptFrm.dfm
View file
Original file line number Diff line number Diff line change
@@ -621,19 +621,32 @@ object EditorOptForm: TEditorOptForm
TabOrder = 3
CodeFolding.ShowCollapsedLine = True
UseCodeFolding = False
Gutter.AutoSize = True
Gutter.BorderStyle = gbsNone
Gutter.DigitCount = 2
Gutter.Font.Charset = DEFAULT_CHARSET
Gutter.Font.Color = clWindowText
Gutter.Font.Height = -12
Gutter.Font.Name = 'Courier New'
Gutter.Font.Style = []
Gutter.LeftOffset = 4
Gutter.RightOffset = 21
Gutter.ShowLineNumbers = True
Gutter.Width = 32
Gutter.GradientEndColor = clBackground
Gutter.Bands = <
item
Kind = gbkMarks
Visible = True
Width = 13
end
item
Kind = gbkLineNumbers
end
item
Kind = gbkFold
end
item
Kind = gbkMargin
Visible = True
Width = 3
end>
HideSelection = True
Highlighter = cpp
Lines.Strings = (
@@ -663,10 +676,6 @@ object EditorOptForm: TEditorOptForm
OnSpecialLineColors = CppEditSpecialLineColors
OnStatusChange = cppEditStatusChange
RemovedKeystrokes = <
item
Command = ecDeleteLastChar
ShortCut = 8200
end
item
Command = ecLineBreak
ShortCut = 8205
@@ -860,16 +869,30 @@ object EditorOptForm: TEditorOptForm
TabStop = False
CodeFolding.ShowCollapsedLine = True
UseCodeFolding = False
Gutter.AutoSize = True
Gutter.BorderStyle = gbsNone
Gutter.Font.Charset = DEFAULT_CHARSET
Gutter.Font.Color = clWindowText
Gutter.Font.Height = -12
Gutter.Font.Name = 'Courier New'
Gutter.Font.Style = []
Gutter.LeftOffset = 4
Gutter.RightOffset = 21
Gutter.ShowLineNumbers = True
Gutter.Bands = <
item
Kind = gbkMarks
Visible = True
Width = 13
end
item
Kind = gbkLineNumbers
end
item
Kind = gbkFold
end
item
Kind = gbkMargin
Visible = True
Width = 3
end>
Highlighter = cpp
Options = [eoAutoIndent, eoHideShowScrollbars, eoKeepCaretX, eoSmartTabs, eoTabIndent, eoTrimTrailingSpaces]
TabWidth = 4
@@ -933,16 +956,30 @@ object EditorOptForm: TEditorOptForm
TabStop = False
CodeFolding.ShowCollapsedLine = True
UseCodeFolding = False
Gutter.AutoSize = True
Gutter.BorderStyle = gbsNone
Gutter.Font.Charset = DEFAULT_CHARSET
Gutter.Font.Color = clWindowText
Gutter.Font.Height = -12
Gutter.Font.Name = 'Courier New'
Gutter.Font.Style = []
Gutter.LeftOffset = 4
Gutter.RightOffset = 21
Gutter.ShowLineNumbers = True
Gutter.Bands = <
item
Kind = gbkMarks
Visible = True
Width = 13
end
item
Kind = gbkLineNumbers
end
item
Kind = gbkFold
end
item
Kind = gbkMargin
Visible = True
Width = 3
end>
Highlighter = cpp
Options = [eoAutoIndent, eoHideShowScrollbars, eoKeepCaretX, eoSmartTabs, eoTabIndent, eoTrimTrailingSpaces]
TabWidth = 4
2 changes: 1 addition & 1 deletion Source/EditorOptFrm.pas
View file
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ interface
Dialogs, ComCtrls, StdCtrls, ExtCtrls, Spin,
SynEdit, SynEditHighlighter, SynHighlighterCpp,
Buttons, ClassBrowser, CppParser, CppTokenizer, StrUtils, Grids,
CppPreprocessor;
CppPreprocessor, SynEditCodeFolding;

type
// Keep history of what we have accessed (does not mean changed)
18 changes: 17 additions & 1 deletion Source/LangFrm.dfm
View file
Original file line number Diff line number Diff line change
@@ -141,7 +141,23 @@ object LangForm: TLangForm
Gutter.Font.Height = -11
Gutter.Font.Name = 'Courier New'
Gutter.Font.Style = []
Gutter.RightOffset = 21
Gutter.Bands = <
item
Kind = gbkMarks
Visible = True
Width = 13
end
item
Kind = gbkLineNumbers
end
item
Kind = gbkFold
end
item
Kind = gbkMargin
Visible = True
Width = 3
end>
Lines.Strings = (
'#include <iostream>'
''
13 changes: 13 additions & 0 deletions Source/VCL/SynEdit/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.pas text
*.dfm text

# Declare files that will always have CRLF line endings on checkout.

# Denote all files that are truly binary and should not be modified.
*.exe binary
*.res binary
12 changes: 1 addition & 11 deletions Source/VCL/SynEdit/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@
*.rsm
*.stat
*.map
*.lib

# Generated source #
###################
@@ -18,11 +17,6 @@
# Backup files #
###################
*.~*
*.bak
*.#00
*.pch
*.Patch
/__history

# IDE Files #
###################
@@ -42,8 +36,4 @@
/Win32
/Win64
/OSX32

# C++ Files #
###################
*.prjmgc

/__history
Loading