Fixed some bugs

Author: tnsr1

foxref.PJT

@@ -2910,8 +2910,8 @@ DEFINE CLASS FoxRef AS Session
 			* see if we're positioned on a #include, SET PROCEDURE TO line
 
 			IF VARTYPE(m.nLineNo) == 'N' AND m.nLineNo > 0
-				*ZAP@241119
-				IF INLIST(ALLTRIM(m.pcSymbol), "IF", "ELSE", "ENDIF")
+				*ZAP@241120
+				IF INLIST(ALLTRIM(m.pcSymbol,0,CHR(32),CHR(9)), "IF", "ELSE", "ENDIF")
 					SELECT ;
 					  DefTable.UniqueID, ;
 					  DefTable.FileID, ;

foxref.PJX

@@ -1421,19 +1421,20 @@ DEFINE CLASS RefSearch AS Custom
 			m.nLineCnt = MEMLINES(m.cTextBlock)
 			_MLINE = 0
 		ENDIF
-
 
 		*ZAP@241119
 		LOCAL lcMargin, llAdd, m.lnMargin
 		m.lcMargin = ""
-		IF INLIST(ALLTRIM(m.pcSymbol), "IF", "ELSE", "ENDIF") AND EMPTY(m.cProcName)
-			m.cProcName = JUSTSTEM(m.pcFileNAme)
-		ENDIF
+
 		FOR m.i = 1 TO m.nLineCnt
-			*ZAP@241120 Wrong LineNo
-			IF m.i = 1480 AND m.cProcName = "foxrefsearch"
-				SET STEP ON 
+			*ZAP@241120
+			IF EMPTY(m.cProcName) AND INLIST(ALLTRIM(m.pcSymbol,0,CHR(32),CHR(9)), "IF", "ELSE", "ENDIF")
+				m.cProcName = JUSTSTEM(m.pcFileNAme)
 			ENDIF
+			*ZAP@241120 Wrong LineNo
+*!*				IF m.i = 134 &&1480 &&AND m.cProcName = "foxrefsearch"
+*!*					SET STEP ON 
+*!*				ENDIF
 			IF m.lUseMemLines
 				m.cCodeLine = MLINE(m.cTextBlock, 1, _MLINE)
 			ELSE

foxref.app

@@ -71,7 +71,7 @@ DEFINE CLASS CFoxRefStart AS Session
 
 		*ZAP@241119
 		PRIVATE m.pcSymbol, m.pcFilename
-		m.pcSymbol = UPPER(m.cSymbol) && ZAP@241120 add UPPER
+		m.pcSymbol = UPPER(LTRIM(m.cSymbol,0,CHR(32),CHR(9))) && ZAP@241120 add UPPER
 		m.pcFilename = m.cFilename
 		m.pnLineNo = m.nLineNo
 
@@ -143,6 +143,10 @@ DEFINE CLASS CFoxRefStart AS Session
 
 			CASE m.nMode == MODE_GOTODEF
 				IF !EMPTY(m.cSelectedText)
+					*ZAP@241120
+					IF EMPTY(m.pcSymbol)
+						m.pcSymbol = UPPER(LTRIM(m.cSelectedText,0,CHR(32),CHR(9)))
+					ENDIF
 					m.cSymbol = m.cSelectedText
 				ENDIF