Commit 2033e6cb authored by Benoît Minisini's avatar Benoît Minisini
Browse files

IDE freeze when search result is refreshed should be fixed now.

[DEVELOPMENT ENVIRONMENT]
* NEW: Procedure popup is larger now.
* BUG: IDE freeze when search result is refreshed should be fixed now.
parent af972b95
Pipeline #540240143 failed with stage
in 20 minutes and 34 seconds
......@@ -486,7 +486,7 @@
MoveScaled(117,0,1,4)
}
{ btnProc MenuButton
MoveScaled(118,0,52,4)
MoveScaled(118,0,54,4)
Mouse = Cursor.Pointing
Action = ".proc"
Text = ("Procedure list")
......@@ -494,10 +494,10 @@
MenuOnly = True
}
{ Separator5 Separator
MoveScaled(170,0,1,4)
MoveScaled(173,0,1,4)
}
{ Panel2 Panel
MoveScaled(172,0,5,4)
MoveScaled(175,0,5,4)
Expand = True
}
{ btnWrap ToolButton
......
......@@ -853,9 +853,9 @@ Public Sub mnuShowCode_Click()
End
Public Sub GetText() As String
Return $hEditor.Text
End
Public Sub GetPosition() As Integer
......
......@@ -482,17 +482,17 @@
MoveScaled(9,4,1,4)
}
{ btnProc MenuButton
MoveScaled(11,4,52,4)
MoveScaled(11,4,54,4)
Mouse = Cursor.Pointing
Action = ".proc"
Text = ("Procedure list")
Border = False
}
{ Separator3 Separator
MoveScaled(63,4,1,4)
MoveScaled(67,4,1,4)
}
{ Panel2 Panel
MoveScaled(66,4,6,4)
MoveScaled(69,4,3,4)
Expand = True
}
{ btnWrap ToolButton
......
......@@ -123,6 +123,7 @@ Private Sub GrepFile(sPath As String, Optional bUseReplaceString As Boolean)
Dim hFile As Object
Dim sResult As String
Dim iFilePos As Integer
Dim hEditor As TextEditor
hFile = Project.Files[sPath]
......@@ -133,8 +134,11 @@ Private Sub GrepFile(sPath As String, Optional bUseReplaceString As Boolean)
Endif
If Not sTemp Then
Try hEditor = hFile.GetEditor()
If hEditor Then Object.Lock(hEditor)
Try sText = hFile.GetText()
If Error Then Return
If hEditor Then Object.Unlock(hEditor)
If Not sText Then Return
sTemp = Temp$("grep")
File.Save(sTemp, sText)
Endif
......@@ -163,40 +167,12 @@ Private Sub GrepFile(sPath As String, Optional bUseReplaceString As Boolean)
aGrep.Add(sTemp)
' If sPath Then
' hGrepResult = $cGrepCache[sPath]
'
' If hGrepResult Then
' Try iAge = hFile.Age
' If iAge = hGrepResult.Age Then
' If aGrep.Join("\n") = hGrepResult.Command Then
' Return hGrepResult.Result
' Endif
' Endif
' Endif
' Endif
'grep -nR -F -I -i -w -ob --exclude=*~ --exclude-dir=.svn -s -- "Date" * .src
Exec aGrep To sGrep
For Each sFind In Split(sGrep, "\n", "", True)
If hFile Then
' If hFile Is FOutput Then
' hResult.Path = ""
' hResult.File = "Console"
' Else
'hResult.Path = sPath
''hResult.File = hFile.Name
'Endif
Else
'hResult.Path = sPath
''hResult.File = If(Project.IsSourcePath(sPath), File.BaseName(sPath), File.Name(sPath))
Endif
'hResult.Highlight = TextEditor.GetModeFromPath(sPath)
iPos = InStr(sFind, ":")
If iPos = 0 Then Continue
......@@ -227,17 +203,5 @@ Private Sub GrepFile(sPath As String, Optional bUseReplaceString As Boolean)
Next
' If sPath Then
' If hFile Then Try iAge = hFile.Age
' hGrepResult = New CGrepResult
' With hGrepResult
' .Result = aResult.Copy()
' .Age = iAge
' .Path = sPath
' .Command = aGrep.Join("\n")
' End With
' $cGrepCache[sPath] = hGrepResult
' Endif
End
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment