diff --git a/source/ide/ide_methods.bas b/source/ide/ide_methods.bas index fcbb58e61..ebd869a6c 100644 --- a/source/ide/ide_methods.bas +++ b/source/ide/ide_methods.bas @@ -7602,7 +7602,6 @@ SUB showvWatchPanel (this AS vWatchPanelType, currentScope$, totalVisibleVariabl 'new setup previousVariableWatchList$ = variableWatchList$ longestVarName = CVL(LEFT$(variableWatchList$, 4)) - expandedList$ = "" totalVisibleVariables = (LEN(variableWatchList$) - 4) \ 8 this.h = totalVisibleVariables + 2 IF this.h > idewy - 10 THEN this.h = idewy - 10 @@ -7652,7 +7651,7 @@ SUB showvWatchPanel (this AS vWatchPanelType, currentScope$, totalVisibleVariabl thisName$ = thisName$ + usedVariableList(tempIndex&).elements item$ = thisName$ + SPACE$(longestVarName - LEN(thisName$)) + " = " IF usedVariableList(tempIndex&).subfunc = currentScope$ OR usedVariableList(tempIndex&).subfunc = "" THEN - isString = (INSTR(usedVariableList(tempIndex&).varType, "STRING *") > 0 OR usedVariableList(tempIndex&).varType = "STRING") + thisIsAString = (INSTR(usedVariableList(tempIndex&).varType, "STRING *") > 0 OR usedVariableList(tempIndex&).varType = "STRING") IF usedVariableList(tempIndex&).isarray THEN seqIndex& = INSTR(usedVariableList(tempIndex&).indexes, MKL$(tempArrayIndex&)) IF seqIndex& <= LEN(usedVariableList(tempIndex&).mostRecentValue) - 3 THEN @@ -7663,7 +7662,7 @@ SUB showvWatchPanel (this AS vWatchPanelType, currentScope$, totalVisibleVariabl tempValue$ = usedVariableList(tempIndex&).mostRecentValue END IF - IF isString THEN + IF thisIsAString THEN item$ = item$ + CHR$(34) + tempValue$ + CHR$(34) ELSE item$ = item$ + tempValue$ @@ -8261,24 +8260,24 @@ FUNCTION idevariablewatchbox$(currentScope$, filter$, selectVar, returnAction) IF IdeDebugMode > 0 THEN IF usedVariableList(x).subfunc = currentScope$ OR usedVariableList(x).subfunc = "" THEN IF usedVariableList(x).watch THEN - isString = (INSTR(usedVariableList(x).varType, "STRING *") > 0 OR usedVariableList(x).varType = "STRING") + thisIsAString = (INSTR(usedVariableList(x).varType, "STRING *") > 0 OR usedVariableList(x).varType = "STRING") IF usedVariableList(x).isarray THEN temp$ = usedVariableList(x).mostRecentValue IF LEN(temp$) THEN l$ = l$ + " = " + CHR$(16) + CHR$(variableNameColor) + "{" DO WHILE LEN(temp$) storageSlot& = CVL(LEFT$(temp$, 4)) temp$ = MID$(temp$, 5) - IF isString THEN l$ = l$ + CHR$(34) + IF thisIsAString THEN l$ = l$ + CHR$(34) l$ = l$ + StrReplace$(vWatchArrayReceivedData$(storageSlot&), CHR$(0), " ") - IF isString THEN l$ = l$ + CHR$(34) + IF thisIsAString THEN l$ = l$ + CHR$(34) IF LEN(temp$) THEN l$ = l$ + "," LOOP IF LEN(usedVariableList(x).mostRecentValue) THEN l$ = l$ + "}" ELSE l$ = l$ + " = " + CHR$(16) + CHR$(variableNameColor) - IF isString THEN l$ = l$ + CHR$(34) + IF thisIsAString THEN l$ = l$ + CHR$(34) l$ = l$ + StrReplace$(usedVariableList(x).mostRecentValue, CHR$(0), " ") - IF isString THEN l$ = l$ + CHR$(34) + IF thisIsAString THEN l$ = l$ + CHR$(34) END IF END IF ELSE