Always reload the project after a pull / update from the repository. Support for the 'ByRef' annotation in '*.info' files.

[DEVELOPMENT ENVIRONMENT]
* NEW: Support for the 'ByRef' annotation in '*.info' files.
* BUG: Version control: Always reload the project after a pull / update from the repository.
This commit is contained in:
gambas 2019-07-15 17:42:00 +02:00
parent f6f7f85f8b
commit 07398d8d82
4 changed files with 19 additions and 10 deletions

View file

@ -683,6 +683,7 @@ Static Public Function TransformSignature(sSign As String, bBalise As Boolean) A
Dim sBold As String
Dim sNoBold As String
Dim sName As String
If bBalise Then
sBold = "<B>"
@ -715,7 +716,12 @@ Static Public Function TransformSignature(sSign As String, bBalise As Boolean) A
sRes = sRes & sBold & "," & sNoBold & " "
Endif
sRes = sRes & Mid$(sSign, iInd + 1, iPos - iInd - 1) & " " & sBold & "AS" & sNoBold & " "
sName = Mid$(sSign, iInd + 1, iPos - iInd - 1)
If sName Begins "&" Then
sRes &= sBold & "BYREF" & sNoBold & " "
sName = Mid$(sName, 2)
Endif
sRes &= sName & " " & sBold & "AS" & sNoBold & " "
iInd = iPos
bName = True

View file

@ -37,7 +37,7 @@ Public Sub _new()
'gvwComponent.Padding = 4
gvwComponent.Columns.Count = 5
gvwComponent.Columns[0].Width = 24
gvwComponent.Columns[0].Width = 16
'gvwComponent.Columns[0].Expand = False
'gvwComponent.Columns[1].Expand = False
gvwComponent.Columns[2].Expand = True
@ -222,7 +222,7 @@ Public Sub gvwComponent_Data(Row As Integer, Column As Integer)
' Endif
Case 1
.Text = hComp.Key
.Text = hComp.Key & " "
.Font.Bold = True
Case 2
@ -782,6 +782,8 @@ End
Public Sub gvwComponent_Draw(X As Integer, Y As Integer, Width As Integer, Height As Integer, Row As Integer, Column As Integer)
Dim sComp As String = $aComp[Row]
Dim DX As Integer
'Dim hComp As CComponent = CComponent.All[sComp]
If Not IsCheckable() Then Return
@ -790,8 +792,10 @@ Public Sub gvwComponent_Draw(X As Integer, Y As Integer, Width As Integer, Heigh
Case 0
X += (Width - 16) \ 2
Y += (Height - 16) \ 2
DX = (Width - 16) \ 2
X += DX
Y += DX
'Y += (gvwComponent.Rows.Height - gvwComponent.Padding * 2 - 16) \ 2
Width = 16
Height = 16

View file

@ -888,7 +888,7 @@ Public Sub ipnProject_Click()
Select Case ipnProject.Text
Case ("Components")
choComponent.SetFocus
'choComponent.SetFocus
choComponent.HideBrowser
btnReset.Show
Case ("Libraries")

View file

@ -367,11 +367,10 @@ Public Sub Update()
Next
Project.Workspace.Unlock
If aRemove.Count Then
Project.Reload
Project.Reload
If aRemove.Count Then
FMain.DoFilter(Project.FILTER_CONFLICT)
Endif
End