paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 06:59:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed reposition sourcemark

Browse Source 
git-svn-id: trunk@4213 -
This commit is contained in:
mattias 2003-05-29 18:47:27 +00:00
parent 5dad254d29
commit 4bff933ab0
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debugger/debugger.pp
View File

@ -41,7 +41,7 @@ uses
type type
TDBGLocationRec = record TDBGLocationRec = record
Adress: Pointer; Address: Pointer;
FuncName: String; FuncName: String;
SrcFile: String; SrcFile: String;
SrcLine: Integer; SrcLine: Integer;
@ -2287,6 +2287,9 @@ end;
end. end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.34 2003/05/29 18:47:27 mattias
fixed reposition sourcemark
Revision 1.33 2003/05/29 17:40:10 marc Revision 1.33 2003/05/29 17:40:10 marc
MWE: * Fixed string resolving MWE: * Fixed string resolving
* Updated exception handling * Updated exception handling

11
ide/debugmanager.pas
View File

@ -220,7 +220,6 @@ procedure TManagedBreakPoints.MasterUpdate(const ASender: TDBGBreakPoints;
var var
n: Integer; n: Integer;
begin begin
writeln('TManagedBreakPoints.MasterUpdate A ',ABreakpoint.ClassName,' ',ABreakpoint.Source,' ',ABreakpoint.Line);
for n := 0 to Count - 1 do for n := 0 to Count - 1 do
begin begin
Result := TManagedBreakPoint(Items[n]); Result := TManagedBreakPoint(Items[n]);
@ -239,9 +238,14 @@ begin
end end
else begin else begin
bp := FindItem; bp := FindItem;
writeln('TManagedBreakPoints.MasterUpdate B ',ABreakpoint.ClassName,' ',
ABreakpoint.Source,' ',ABreakpoint.Line,' ',bp <> nil);
if bp <> nil then begin if bp <> nil then begin
bp.UpdateSourceMark; bp.UpdateSourceMark;
Update(bp); Update(bp);
end else begin
writeln('WARNING: TManagedBreakPoints.MasterUpdate unknown breakpoint: ',
ABreakpoint.Source,' ',ABreakpoint.Line);
end; end;
end; end;
end; end;
@ -572,7 +576,7 @@ begin
if ALocation.SrcLine = -1 if ALocation.SrcLine = -1
then begin then begin
MessageDlg(lisExecutionPaused, MessageDlg(lisExecutionPaused,
Format(lisExecutionPausedAdress, [#13#13, ALocation.Adress, #13, Format(lisExecutionPausedAdress, [#13#13, ALocation.Address, #13,
ALocation.FuncName, #13, ALocation.SrcFile, #13#13#13, #13]), ALocation.FuncName, #13, ALocation.SrcFile, #13#13#13, #13]),
mtInformation, [mbOK],0); mtInformation, [mbOK],0);
@ -1344,6 +1348,9 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.38 2003/05/29 18:47:27 mattias
fixed reposition sourcemark
Revision 1.37 2003/05/29 17:40:10 marc Revision 1.37 2003/05/29 17:40:10 marc
MWE: * Fixed string resolving MWE: * Fixed string resolving
* Updated exception handling * Updated exception handling

2
ide/editoroptions.pp
View File

@ -68,7 +68,7 @@ type
const const
EditorOptsFormatVersion = 2; EditorOptsFormatVersion = 2;
AdditionalHighlightAttributes : array[TAdditionalHilightAttribute] of string = AdditionalHighlightAttributes: array[TAdditionalHilightAttribute] of string =
( (
'', '',
'Text block', 'Text block',

6
ide/sourcemarks.pas
View File

@ -287,7 +287,9 @@ end;
procedure TSourceMark.SetColumn(const Value: Integer); procedure TSourceMark.SetColumn(const Value: Integer);
begin begin
if Column=Value then exit; if Column=Value then exit;
if FSourceMarks<>nil then FSourceMarks.fSortedItems.Remove(Self);
inherited SetColumn(Value); inherited SetColumn(Value);
if FSourceMarks<>nil then FSourceMarks.fSortedItems.Add(Self);
DoPositionChanged; DoPositionChanged;
end; end;
@ -300,7 +302,9 @@ end;
procedure TSourceMark.SetLine(const Value: Integer); procedure TSourceMark.SetLine(const Value: Integer);
begin begin
if Line=Value then exit; if Line=Value then exit;
if FSourceMarks<>nil then FSourceMarks.fSortedItems.Remove(Self);
inherited SetLine(Value); inherited SetLine(Value);
if FSourceMarks<>nil then FSourceMarks.fSortedItems.Add(Self);
DoPositionChanged; DoPositionChanged;
end; end;
@ -569,6 +573,8 @@ begin
EditorAndLine.Line:=ALine; EditorAndLine.Line:=ALine;
AVLNode:=fSortedItems.FindLeftMostKey(@EditorAndLine, AVLNode:=fSortedItems.FindLeftMostKey(@EditorAndLine,
@CompareEditorAndLineWithMark); @CompareEditorAndLineWithMark);
if ALine=50 then
writeln('TSourceMarks.GetMarksForLine ',Aline,' ',AVLNode<>nil);
while (AVLNode<>nil) do begin while (AVLNode<>nil) do begin
CurMark:=TSourceMark(AVLNode.Data); CurMark:=TSourceMark(AVLNode.Data);
if CompareEditorAndLineWithMark(@EditorAndLine,CurMark)<>0 then break; if CompareEditorAndLineWithMark(@EditorAndLine,CurMark)<>0 then break;