Some debugger fixes.
[DEVELOPMENT ENVIRONMENT] * NEW: Version control: Use underline cursor style for version control terminal. * OPT: Debugger: Do not refresh local and object variables if they are not collapsed. * BUG: Debugger: Take into account that the debugger answer is unlimited now.
This commit is contained in:
parent
fdc47c8744
commit
8d064e7cfc
7 changed files with 50 additions and 18 deletions
|
@ -32,7 +32,7 @@ Component=gb.util.web
|
|||
Description="Integrated Development Environment for Gambas"
|
||||
Authors="Benoît Minisini\nFabien Bodard\nCharlie Reinl\nJosé Luis Redrejo\nRobert Rowe\nTobias Boege"
|
||||
Arguments=[["-L"],["-t","/home/benoit/gambas/git/master/app/src/gambas3"],["--help"]]
|
||||
Environment="GB_GUI=gb.qt5\n GTK_DEBUG=interactive"
|
||||
Environment="GB_GUI=gb.qt5\n GTK_DEBUG=interactive\nGB_NO_JIT=1"
|
||||
TabSize=2
|
||||
Translate=1
|
||||
Language=en
|
||||
|
|
|
@ -60,6 +60,8 @@ Private $sRemoteLink As String
|
|||
Private $hTimerRemote As Timer
|
||||
Private $hTimerWatch As Timer
|
||||
|
||||
Private $sBuffer As String
|
||||
|
||||
Public Sub Init()
|
||||
|
||||
$sFifo = Debug.Begin()
|
||||
|
@ -270,9 +272,16 @@ Public Sub Debug_Read(Data As String)
|
|||
Dim sVar As String
|
||||
Dim sError As String
|
||||
Dim sWhere As String
|
||||
Dim iPos As Integer
|
||||
|
||||
If Not Data Then Return
|
||||
'Debug Quote(Data)
|
||||
$sBuffer &= Data
|
||||
iPos = InStr($sBuffer, "\n")
|
||||
If iPos = 0 Then Return
|
||||
|
||||
Data = Left($sBuffer, iPos - 1)
|
||||
$sBuffer = Mid$($sBuffer, iPos + 1)
|
||||
|
||||
If Data = "!" Then
|
||||
Signal
|
||||
Return
|
||||
|
@ -282,7 +291,6 @@ Public Sub Debug_Read(Data As String)
|
|||
Return
|
||||
Endif
|
||||
|
||||
'Debug Data
|
||||
aData = Split(Data, "\t")
|
||||
|
||||
Select Left$(aData[0])
|
||||
|
|
|
@ -1273,6 +1273,31 @@ Public Sub btnRemoveAllBreakpoint_Click()
|
|||
|
||||
End
|
||||
|
||||
Private Sub RefreshVariable()
|
||||
|
||||
Dim sRoot As String
|
||||
Dim hTree As ColumnView
|
||||
|
||||
For Each sRoot In ["^", "~"]
|
||||
|
||||
hTree = If(sRoot = "^", cvwObject, hTree)
|
||||
|
||||
If Not hTree.MoveTo(sRoot) Then
|
||||
If hTree.Item.Expanded Then
|
||||
If Not hTree.MoveChild() Then
|
||||
Repeat
|
||||
With hTree.Item
|
||||
Design.Command("&V" & .Key & "\t" & .Text)
|
||||
End With
|
||||
Until hTree.MoveNext()
|
||||
Endif
|
||||
Endif
|
||||
Endif
|
||||
|
||||
Next
|
||||
|
||||
End
|
||||
|
||||
Public Sub DefineVariable(sLocal As String, sObject As String)
|
||||
|
||||
Dim aLocal As String[]
|
||||
|
@ -1370,14 +1395,7 @@ Public Sub DefineVariable(sLocal As String, sObject As String)
|
|||
|
||||
If wizDebug.Index <> TAB_DEBUG Then Return
|
||||
|
||||
For Each sVar In aObject
|
||||
If Right(sVar) = ":" Then Continue
|
||||
Design.Command("&V^" & sVar & "\t" & sVar)
|
||||
Next
|
||||
|
||||
For Each sVar In aLocal
|
||||
Design.Command("&V~" & sVar & "\t" & sVar)
|
||||
Next
|
||||
RefreshVariable
|
||||
|
||||
End
|
||||
|
||||
|
@ -1883,3 +1901,9 @@ Public Sub btnVcChanges_Click()
|
|||
|
||||
End
|
||||
|
||||
|
||||
Public Sub cvwVariable_Expand()
|
||||
|
||||
RefreshVariable
|
||||
|
||||
End
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
Index = 0
|
||||
Text = ("Debugging")
|
||||
{ panDebug VBox
|
||||
MoveScaled(0,3,137,40)
|
||||
MoveScaled(0,3,134,40)
|
||||
Expand = True
|
||||
{ splDebug HSplit
|
||||
MoveScaled(1,1,127,32)
|
||||
|
@ -446,6 +446,7 @@
|
|||
Border = False
|
||||
Limit = 65536
|
||||
Blink = True
|
||||
CursorStyle = TerminalView.Underline
|
||||
ShowLink = True
|
||||
ReadOnly = True
|
||||
}
|
||||
|
|
|
@ -101,7 +101,7 @@
|
|||
MoveScaled(34,8,13,0)
|
||||
}
|
||||
{ trmOutput TerminalView
|
||||
MoveScaled(5,13,69,27)
|
||||
MoveScaled(5,13,72,27)
|
||||
Expand = True
|
||||
Border = False
|
||||
Limit = 65536
|
||||
|
|
|
@ -1124,8 +1124,7 @@ End
|
|||
Public Sub gvwComp_Select()
|
||||
|
||||
If Not $bShowHelp Then Return
|
||||
timHelp.Stop
|
||||
timHelp.Start
|
||||
timHelp.Restart
|
||||
|
||||
Catch
|
||||
|
||||
|
|
|
@ -298,7 +298,7 @@
|
|||
Text = ("Automatic translation with ")
|
||||
}
|
||||
{ URLLabel2 URLLabel
|
||||
MoveScaled(23,0,14,4)
|
||||
MoveScaled(24,0,14,4)
|
||||
#Translate = False
|
||||
AutoResize = True
|
||||
Text = "translate-shell"
|
||||
|
@ -810,7 +810,7 @@
|
|||
}
|
||||
Index = 6
|
||||
Text = ("Interface")
|
||||
Picture = Picture["icon:/large/view-icon"]
|
||||
Picture = Picture["icon:/large/window"]
|
||||
{ Label43 Label
|
||||
MoveScaled(0,1,63,3)
|
||||
Font = Font["Bold"]
|
||||
|
@ -1188,7 +1188,7 @@
|
|||
}
|
||||
Index = 9
|
||||
Text = ("Themes")
|
||||
Picture = Picture["icon:/large/color"]
|
||||
Picture = Picture["icon:/large/theme"]
|
||||
{ Label27 Label
|
||||
MoveScaled(0,1,63,3)
|
||||
Font = Font["Bold"]
|
||||
|
|
Loading…
Reference in a new issue