From f1a8b66d7d67a17c11c6a3fc7c5cf4abbda0ff17 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 21 Jul 2014 17:17:32 +0000
Subject: [PATCH] ide: Jump to definition improved #802

git-svn-id: svn://ultimatepp.org/upp/trunk@7525 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CodeEditor/FindReplace.cpp |   2 ++
 uppsrc/ide/Assist.cpp             |  26 ++++++++++++++++++++++++++
 uppsrc/ide/icon.ico               | Bin 2862 -> 2862 bytes
 uppsrc/ide/ide.h                  |   1 +
 4 files changed, 29 insertions(+)

diff --git a/uppsrc/CodeEditor/FindReplace.cpp b/uppsrc/CodeEditor/FindReplace.cpp
index 3c0e502af..5d3b69772 100644
--- a/uppsrc/CodeEditor/FindReplace.cpp
+++ b/uppsrc/CodeEditor/FindReplace.cpp
@@ -514,6 +514,8 @@ int CodeEditor::BlockReplace()
 
 void CodeEditor::OpenNormalFindReplace0(bool replace)
 {
+	if(GetLength() > 1000000)
+		findreplace.incremental <<= false;
 	findreplace.Setup(replace);
 	findreplace.find.SetFocus();
 	findreplace.itext = GetI();
diff --git a/uppsrc/ide/Assist.cpp b/uppsrc/ide/Assist.cpp
index 130c7c8a9..a3520e1b0 100644
--- a/uppsrc/ide/Assist.cpp
+++ b/uppsrc/ide/Assist.cpp
@@ -1067,6 +1067,30 @@ bool IsPendif(const String& l)
 	return l.Find("#endif") >= 0;
 }
 
+void Ide::FindId(const String& id)
+{
+	int pos = editor.GetCursor();
+	int h = min(editor.GetLength(), pos + 4000);
+	for(;;) {
+		if(pos >= h || findarg(editor[pos], ';', '{', '}') >= 0)
+			break;
+		if(iscib(editor[pos])) {
+			int p0 = pos;
+			String tid;
+			while(pos < h && iscid(editor[pos])) {
+				tid.Cat(editor[pos]);
+				pos++;
+			}
+			if(tid == id) {
+				editor.SetCursor(p0);
+				return;
+			}
+		}
+		else
+			pos++;
+	}	
+}
+
 void Ide::ContextGoto0(int pos)
 {
 	if(designer)
@@ -1174,6 +1198,7 @@ void Ide::ContextGoto0(int pos)
 		if(q >= 0) {
 			AddHistory();
 			editor.SetCursor(editor.GetPos(parser.local[q].line - 1));
+			FindId(id);
 			return;
 		}
 	}
@@ -1218,6 +1243,7 @@ void Ide::ContextGoto0(int pos)
 			for(int i = 0; i < n.GetCount(); i++) {
 				if(n[i].IsType() == istype && n[i].name == id) {
 					JumpToDefinition(n, i, scope[j]);
+					FindId(id);
 					return;
 				}
 			}
diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico
index ed674dab4681e8f6a8a54a9f03063eb6fa681734..42fe9074dc7d523b005b236290ec9cd7a64b5088 100644
GIT binary patch
literal 2862
zcmcguOKam+6#o1+SxuK+Rd~}3gM*!vWEv9~KV(-#eh}FX3<Be^om603#g8Pb5|~1}
zD{Y#Yc+=nFMK|4d(Z8VI(1Lr;l_krvCxmwBg{yPVx##=tcg~fCfdE2y_6%Zt9R?0*
z<@yoeSBg3QZUBhx0K1$+Q=%CVPv8~h{f}coXZh!2$NO^^6j;pXb1|R5CGu`>Zx=i{
zpYaX{``*1RLKZv-VNb^LYRMtar-;Mt!;AAo4&^)6W%I<Gy`?21hFj-ay(=|>)7fK7
zD4x#vAfB>B9hA71!@dLd@45Uok{CqpqxdDCqsz8-2VMM@9FGLn>2_?%<MV0%1N~>7
z?RdUI=H+^yfEOgoe7g^fweh^?_QtE+UN1G<z2fsYcg3-a3oV;?e`JHtpYSn!uI%s6
zfO%*&Z|NK2pWc05GlsG2-<i0O^osEQ5f6s(<J<2MUxe|;Z@(iRTp&gS3yLo&#w|aQ
z63FZnkZY8nREm&JB<v?LD9AaKS~)27*CHp8*@2vEprtA}Emt8+CrG3c*eS?plv=3O
z6;w0{QX+}2i!UNu($>yUm5Mk+@ToF1xdm0Ji&%<qXR?Z{CR40}a<#A#uh#0QR&37d
zzJ!vNB>iVl<t*fuhS$XB)smKy(2}I{Oop7*&?>5gVV#~B*TnTWx=XUFF<bvi=s(tV
zjLb{42NH~a57O=p4xj5N8y%Qq6BDV4@w5#|o1kl$NT>Fo>v;?YCXNW(?Pc)qIGV(h
z!!VO4TZ4Hy!aypb-y1_O8>DHBi;0B7Df#CHy5=?IU12Y+BWDb$HwyA<!@jTlG4$F9
zmm|_yG|(GMxOsU<`DJuQCd`Won#LIIzJ$rN3sXvCFQuc|(V+}Gn09-}AM2=5?x;OL
z(dc7LwHcie#^wdpUa<XP7uRDQS4Z3f1)csBJ)ysf-cW;@Jjd{0A3Evl(>WQ|HP!LW
z<rsb98+Q6`zjS>&hTk70$M?9|m))C}c<$BJG%#)Vp-rYRObMyI6!c~Xx@y>Gul2-x
zry5SFj&ss!UQ>Usj*w>FH}+j_XzLqPZ*!v_;|;xQ&hMtBB7e%dQ*<}}U+lWiKj{?a
z^sap;HXi=^7Jt65*Xx<vJ?m*B8Vb3Ip+LZjMne`EG2)Sk6^ll#$kOLvEEcslEh|LB
z3dUl*;F#?P*ZoK^=<EwzBocJ+7W0Q`I{d;9d;ECZ3WdW~d?k^%!Y=;N#mD{5+JEHc
zTUz~;@9Y+s8=7s7cLyB1`{Z5cr%z|IhsOJhd$P0H`zwAP9Q=HJM;T;4x9xp`?QC{`
e#?ObwFAdHoD+~L>UE$$N-nsjNpT6;5`}7a&zdqgo

literal 2862
zcmcguy^hmB5FVe6&r5ZbRGhBi%1A*-bS~fpkW!{XLOcPqktm=;5ONncJc|n&dL9SK
z%r~>MyIv<z;G!F8c6NTgZ)eBRDntd9ba6o<?<%6_ybJyVq8}VH|GFTm9}-=ohV_!Q
zkd>(Ax_gv?&&u`C@p<jQfuZkv(IdE|ZnatsP}Bo&9PrcJjz$IuBUFLK&U48595L<;
zFXu@O*P9J&Nz8KIvJnaQ9Njl|Bb=6lWfat8FP^L99$Yx8fp6eE7x)#)3{ra#@A<4R
zwK~Co-%*pafIh>-JWu9xe$V{Dvm1|32wvRx2)vN^dYuEXibpQYChc7JzGs~k&O>eF
zh;iv<iq9hxzP#WRK5q8s2~l50UGW=|YnsO%7+}ZmOd~C|jL)SxtLV$ePt*(*{r>rj
znzMn<nPA}fz%d<pjxv9I%B6%`OWu#=yZ+M`oYZq*=!t(3tVeK3-HP}%V?{mi#sNRg
zv7ZZOYmgBhK`xe@ac5wkw>q@~@I5GgoKHByJ@fk-2k@3l=3x}0T#}c*!0~^0%p>-E
z==`)U?roltBjzN=Zjj0R{pirX?}J}6|7`;*Zcc*Nr%%t*IbyFqa>;Dt$+{cOibLU>
z7#^`i6}5MD$4On5p|C6pSJ$OuBhs|3Th_H}y^r8>S!>d{lEuxIOKcERe>V2p+062S
zYulOO9r!C&;}^e5{HAebRk<d%$Xr#xAKYN(r+a7hk6gcF+IM?riMpxW%n@5Zx_R^U
zao24Zw{JIWyYBWq*7^L~hc#EQeX4eI1>1F-*I2iU?+etkeI@qu`sMZoGV5npGr8-W
F{sOt@+Oq%v

diff --git a/uppsrc/ide/ide.h b/uppsrc/ide/ide.h
index b3ba8992c..b8e4f6a93 100644
--- a/uppsrc/ide/ide.h
+++ b/uppsrc/ide/ide.h
@@ -984,6 +984,7 @@ public:
 		void  ScanFile();
 		bool  SwapSIf(const char *cref);
 		void  SwapS();
+		void  FindId(const String& id);
 		void  ContextGoto0(int pos);
 		void  ContextGoto();
 		void  CtrlClick(int pos);