QB64/QB64-PE
QB64/QB64-PE
1
1
Fork 0
mirror of https://github.com/QB64-Phoenix-Edition/QB64pe.git synced 2024-06-26 17:10:38 +00:00
Code Issues Releases Wiki Activity

Reduces repeated code in routine to find SUB/FUNCTION names (IDE).

Browse source
This commit is contained in:
FellippeHeitor 2021-01-19 00:13:17 -03:00
parent 5b7c241ac4
commit a23bbb8927
1 changed files with 16 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
source/ide/ide_methods.bas
View file

@ -896,14 +896,7 @@ FUNCTION ide2 (ignore)
END IF
NEXT
'attempt to cleanse sfname$, just in case there are any comments or other unwanted stuff
FOR CleanseSFNAME = 1 TO LEN(sfname$)
SELECT CASE MID$(sfname$, CleanseSFNAME, 1)
CASE " ", "'", ":"
sfname$ = LEFT$(sfname$, CleanseSFNAME - 1)
EXIT FOR
END SELECT
NEXT
cleanSubName sfname$
'update title of main window
GOSUB UpdateTitleOfMainWindow
@ -2680,20 +2673,13 @@ FUNCTION ide2 (ignore)
IF x THEN
n$ = RTRIM$(LEFT$(a$, x - 1))
args$ = RIGHT$(a$, LEN(a$) - x + 1)
x = INSTR(args$, ")"): IF x THEN args$ = LEFT$(args$, x)
ELSE
n$ = a$
args$ = ""
cleanSubName n$
END IF
'attempt to cleanse n$, just in case there are any comments or other unwanted stuff
FOR CleanseN = 1 TO LEN(n$)
SELECT CASE MID$(n$, CleanseN, 1)
CASE " ", "'", ":"
n$ = LEFT$(n$, CleanseN - 1)
EXIT FOR
END SELECT
NEXT
backupn$ = n$
DO UNTIL alphanumeric(ASC(RIGHT$(n$, 1)))
@ -8197,7 +8183,7 @@ SUB ideshowtext
manualList = -1
listOfCustomKeywords$ = LEFT$(listOfCustomKeywords$, customKeywordsLength)
FOR y = 1 TO iden
a$ = UCASE$(LTRIM$(RTRIM$(idegetline(y))))
a$ = UCASE$(_TRIM$(idegetline(y)))
sf = 0
IF LEFT$(a$, 4) = "SUB " THEN sf = 1
IF LEFT$(a$, 9) = "FUNCTION " THEN sf = 2
@ -8216,16 +8202,9 @@ SUB ideshowtext
x = INSTR(a$, "(")
IF x THEN
a$ = RTRIM$(LEFT$(a$, x - 1))
ELSE
cleanSubName a$
END IF
'attempt to cleanse n$, just in case there are any comments or other unwanted stuff
FOR CleanseN = 1 TO LEN(a$)
SELECT CASE MID$(a$, CleanseN, 1)
CASE " ", "'", ":"
a$ = LEFT$(a$, CleanseN - 1)
EXIT FOR
END SELECT
NEXT
listOfCustomKeywords$ = listOfCustomKeywords$ + "@" + removesymbol2$(a$) + "@"
END IF
NEXT
@ -8889,19 +8868,13 @@ FUNCTION idesubs$
IF x THEN
n$ = RTRIM$(LEFT$(a$, x - 1))
args$ = RIGHT$(a$, LEN(a$) - x + 1)
x = INSTR(args$, ")"): IF x THEN args$ = LEFT$(args$, x)
ELSE
n$ = a$
args$ = ""
END IF
'attempt to cleanse n$, just in case there are any comments or other unwanted stuff
FOR CleanseN = 1 TO LEN(n$)
SELECT CASE MID$(n$, CleanseN, 1)
CASE " ", "'", ":"
n$ = LEFT$(n$, CleanseN - 1)
EXIT FOR
END SELECT
NEXT
cleanSubName n$
END IF
'If the user currently has the cursor over a SUB/FUNC name, let's highlight it
'instead of the currently in edition, for a quick link functionality:
@ -13522,17 +13495,9 @@ SUB IdeMakeContextualMenu
n$ = RTRIM$(LEFT$(a$, x - 1))
ELSE
n$ = a$
cleanSubName n$
END IF
'attempt to cleanse n$, just in case there are any comments or other unwanted stuff
FOR CleanseN = 1 TO LEN(n$)
SELECT CASE MID$(n$, CleanseN, 1)
CASE " ", "'", ":"
n$ = LEFT$(n$, CleanseN - 1)
EXIT FOR
END SELECT
NEXT
n2$ = n$
IF LEN(n2$) > 1 THEN
DO UNTIL alphanumeric(ASC(RIGHT$(n2$, 1)))
@ -14875,5 +14840,11 @@ FUNCTION removesymbol2$ (varname$)
removesymbol2$ = LEFT$(varname$, i - 1)
END FUNCTION
SUB cleanSubName (n$)
x = INSTR(n$, "'"): IF x THEN n$ = LEFT$(n$, x - 1)
x = INSTR(n$, ":"): IF x THEN n$ = LEFT$(n$, x - 1)
x = INSTR(n$, " "): IF x THEN n$ = LEFT$(n$, x - 1)
END SUB
'$INCLUDE:'wiki\wiki_methods.bas'