Skip to content

[FlashDebugger] Added removal of breakpoint markers when switching projects. fixes #456 #3176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SlavaRa merged 1 commit into from
Dec 11, 2020
Merged

[FlashDebugger] Added removal of breakpoint markers when switching projects. fixes #456 #3176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 31 additions & 25 deletions External/Plugins/FlashDebugger/Controls/BreakPointUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,8 @@ public BreakPointUI(BreakPointManager breakPointManager)

void BreakPointManager_UpdateBreakPointEvent(object sender, UpdateBreakPointArgs e)
{
int index = ItemIndex(e.FileFullPath, e.OldLine);
if (index >= 0)
{
dgv.Rows[index].Cells["Line"].Value = e.NewLine.ToString();
}
var index = ItemIndex(e.FileFullPath, e.OldLine);
if (index >= 0) dgv.Rows[index].Cells["Line"].Value = e.NewLine.ToString();
}

void BreakPointManager_ChangeBreakPointEvent(object sender, BreakPointArgs e)
Expand Down Expand Up @@ -170,7 +167,7 @@ void Dgv_CellEndEdit(object sender, DataGridViewCellEventArgs e)
breakPointManager.SetBreakPointCondition(filename, line - 1, exp);
}

public void Clear() => dgv.Rows.Clear();
public void Clear() => RemoveAllMarkers();

public new bool Enabled
{
Expand Down Expand Up @@ -340,10 +337,10 @@ void TsbRemoveSelected_Click(object sender, EventArgs e)
var filefullpath = (string)selected.Cells["FilePath"].Value;
var line = int.Parse((string)selected.Cells["Line"].Value) - 1;
var doc = ScintillaHelper.GetDocument(filefullpath);
if (doc != null)
if (doc?.SciControl is {} sci)
{
bool m = ScintillaHelper.IsMarkerSet(doc.SciControl, ScintillaHelper.markerBPDisabled, line);
doc.SciControl.MarkerDelete(line, m ? ScintillaHelper.markerBPDisabled : ScintillaHelper.markerBPEnabled);
var m = ScintillaHelper.IsMarkerSet(sci, ScintillaHelper.markerBPDisabled, line);
sci.MarkerDelete(line, m ? ScintillaHelper.markerBPDisabled : ScintillaHelper.markerBPEnabled);
}
else breakPointManager.SetBreakPointInfo(filefullpath, line, true, false);
dgv.Rows.Remove(selected);
Expand All @@ -356,21 +353,26 @@ void TsbRemoveFiltered_Click(object sender, EventArgs e)
{
if (dgv.Rows.Count == 0) return;
breakPointManager.ChangeBreakPointEvent -= BreakPointManager_ChangeBreakPointEvent;
foreach (DataGridViewRow row in dgv.Rows)
RemoveAllMarkers();
breakPointManager.ChangeBreakPointEvent += BreakPointManager_ChangeBreakPointEvent;
breakPointManager.Save();
}

void RemoveAllMarkers()
{
for (var i = dgv.Rows.Count - 1; i >= 0; i--)
{
var filefullpath = (string)row.Cells["FilePath"].Value;
var line = int.Parse((string)row.Cells["Line"].Value) - 1;
var doc = ScintillaHelper.GetDocument(filefullpath);
if (doc != null)
var row = dgv.Rows[i];
var fileName = (string) row.Cells["FilePath"].Value;
var line = int.Parse((string) row.Cells["Line"].Value) - 1;
if (ScintillaHelper.GetDocument(fileName)?.SciControl is {} sci)
{
var m = ScintillaHelper.IsMarkerSet(doc.SciControl, ScintillaHelper.markerBPDisabled, line);
doc.SciControl.MarkerDelete(line, m ? ScintillaHelper.markerBPDisabled : ScintillaHelper.markerBPEnabled);
var m = ScintillaHelper.IsMarkerSet(sci, ScintillaHelper.markerBPDisabled, line);
sci.MarkerDelete(line, m ? ScintillaHelper.markerBPDisabled : ScintillaHelper.markerBPEnabled);
}
else breakPointManager.SetBreakPointInfo(filefullpath, line, true, false);
else breakPointManager.SetBreakPointInfo(fileName, line, true, false);
}
dgv.Rows.Clear();
breakPointManager.ChangeBreakPointEvent += BreakPointManager_ChangeBreakPointEvent;
breakPointManager.Save();
}

void TsbAlternateFiltered_Click(object sender, EventArgs e)
Expand Down Expand Up @@ -402,9 +404,11 @@ void TsbAlternateFiltered_Click(object sender, EventArgs e)

void TsbExportFiltered_Click(object sender, EventArgs e)
{
using var dialog = new SaveFileDialog();
dialog.OverwritePrompt = true;
dialog.Filter = TextHelper.GetString("ProjectManager.Info.FileFilter");
using var dialog = new SaveFileDialog
{
OverwritePrompt = true,
Filter = TextHelper.GetString("ProjectManager.Info.FileFilter")
};
if (dialog.ShowDialog(this) != DialogResult.OK) return;
try
{
Expand All @@ -418,9 +422,11 @@ void TsbExportFiltered_Click(object sender, EventArgs e)

void TsbImport_Click(object sender, EventArgs e)
{
using var dialog = new OpenFileDialog();
dialog.CheckFileExists = true;
dialog.Filter = TextHelper.GetString("ProjectManager.Info.FileFilter");
using var dialog = new OpenFileDialog
{
CheckFileExists = true,
Filter = TextHelper.GetString("ProjectManager.Info.FileFilter")
};
if (dialog.ShowDialog(this) != DialogResult.OK) return;
try
{
Expand Down
2 changes: 1 addition & 1 deletion External/Plugins/FlashDebugger/PluginMain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public void HandleEvent(object sender, NotifyEvent e, HandlingPriority priority)
de.Handled = true;
return;
}
if (!de.Action.StartsWithOrdinal(nameof(ProjectManager))) return;
if (!de.Action.StartsWithOrdinal(nameof(ProjectManager))) return;
if (de.Action == ProjectManagerEvents.Project)
{
var project = PluginBase.CurrentProject;
Expand Down