github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

theide: Syntax highlighting fix, Navigator fix

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1231 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-05-24 18:09:57 +00:00
parent abc2e30e44
commit b4fa5709a8
12 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CodeEditor/Highlight.cpp
View file

@ -552,7 +552,7 @@ void CodeEditor::HighlightLine(int line, Vector<LineEdit::Highlight>& hl, int po
hls.SetPaper(hls.pos, text.GetLength() + 1 - hls.pos, BlockColor(--block_level));
Bracket(int(p - text) + pos, hls);
int& l = *p == ')' ? ss.pl : *p == '}' ? ss.cl : ss.bl;
if(bl == 0 || bc && (bc != *p || l <= 0) || !bc && *p != '}') {
if(bc && (bc != *p || l <= 0) || bc == 0 && *p != '}') {
hls.Put(p == ~text ? hl_style[INK_PAR0] : hl_style[INK_ERROR]);
ss.brk.Clear();
ss.cl = ss.bl = ss.pl = 0;

4
uppsrc/CodeEditor/Syntax.cpp
View file

@ -274,7 +274,7 @@ void CodeEditor::SyntaxState::ScanSyntax(const wchar *ln, const wchar *e)
else
if(c == '}') {
if(brk.GetCount()) {
if(brk.Top() == '}') {
if(brk.Top()) {
cl--;
if(bid.GetCount() > 1)
bid.Drop();
@ -369,7 +369,9 @@ bool CodeEditor::SyntaxState::MatchHilite(const SyntaxState& st) const
return comment == st.comment
&& linecont == st.linecont
&& linecomment == st.linecomment
&& string == st.string
&& macro == st.macro
&& was_namespace == st.was_namespace
&& cl == st.cl && bl == st.bl && pl == st.pl
&& IsEqual(brk, st.brk)
&& IsEqual(blk, st.blk)

2
uppsrc/ide/Browser/Browser.upp
View file

@ -1,4 +1,4 @@
description "TheIDE - code browser and Topic++\377";
description "TheIDE - code browser and Topic++\377B";
uses
CppBase,

2
uppsrc/ide/Browser/CodeBrowser.cpp
View file

@ -189,7 +189,7 @@ void CodeBrowser::LoadScope()
for(int i = 0; i < n.GetCount(); i = file < 0 ? FindNext(n, i) : i + 1) {
CppItemInfo m;
(CppItem&) m = n[i];
if((m.uname.StartsWith(find) || filematch && m.file == file) && set.Find(m.qitem) < 0) {
if((find.GetCount() && m.uname.StartsWith(find) || filematch && m.file == file) && set.Find(m.qitem) < 0) {
set.Add(m.qitem);
int q = inherited.Find(m.qitem);
if(q >= 0) {

2
uppsrc/ide/Browser/init
View file

@ -4,7 +4,7 @@
#include "ide\Common/init"
#include "PdfDraw/init"
#include "RichEdit/init"
#define BLITZ_INDEX__ F6887F3691048C961C2D3E1070431DCF8
#define BLITZ_INDEX__ FCB83C9D580625CD4EAD50BEDC296DB64
#include "TopicI.icpp"
#undef BLITZ_INDEX__
#endif

2
uppsrc/ide/Builders/Builders.upp
View file

@ -1,4 +1,4 @@
description "TheIDE - builders - routines to compile programs";
description "TheIDE - builders - routines to compile programs\377B";
uses
coff\binobj,

2
uppsrc/ide/Common/Common.upp
View file

@ -1,3 +1,5 @@
description "\377B";
uses
ide\Core;

2
uppsrc/ide/Core/Core.upp
View file

@ -1,4 +1,4 @@
description "TheIDE - common library";
description "TheIDE - common library\377B";
uses
CtrlLib,

2
uppsrc/ide/Debuggers/Debuggers.upp
View file

@ -1,4 +1,4 @@
description "TheIDE - debuggers";
description "TheIDE - debuggers\377B";
uses
ide\Common,

2
uppsrc/ide/IconDes/IconDes.upp
View file

@ -1,4 +1,4 @@
description "TheIDE - .iml designer";
description "TheIDE - .iml designer\377B";
uses
IconDes,

2
uppsrc/ide/LayDes/LayDes.upp
View file

@ -1,4 +1,4 @@
description "TheIDE - .lay designer";
description "TheIDE - .lay designer\377B";
uses
ide\Common,

2
uppsrc/ide/QuickTabs/QuickTabs.upp
View file

@ -1,3 +1,5 @@
description "\377B";
uses
CtrlLib;