Skip to content

Commit aa7fd85

Browse files
committed
Document list access improvements...
1 parent 0902cb4 commit aa7fd85

File tree

4 files changed

+18
-23
lines changed

4 files changed

+18
-23
lines changed

External/Plugins/FlashDebugger/Debugger/BreakPointManager.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,9 @@ public Boolean ShouldBreak(SourceFile file, int line, Frame frame)
191191
public void SetBreakPointsToEditor(PluginCore.ITabbedDocument[] documents)
192192
{
193193
m_bAccessable = false;
194-
for (int i = 0; i < documents.Length; i++)
194+
foreach (ITabbedDocument document in documents)
195195
{
196-
ScintillaControl sci = documents[i].SciControl;
196+
ScintillaControl sci = document.SciControl;
197197
if (sci == null) continue;
198198
if (Path.GetExtension(sci.FileName) == ".as" || Path.GetExtension(sci.FileName) == ".mxml")
199199
{
@@ -213,10 +213,9 @@ public void SetBreakPointsToEditor(PluginCore.ITabbedDocument[] documents)
213213
public void SetBreakPointsToEditor(string filefullpath)
214214
{
215215
m_bAccessable = false;
216-
ITabbedDocument[] documents = PluginBase.MainForm.Documents;
217-
for (int i = 0; i < documents.Length; i++)
216+
foreach (ITabbedDocument document in PluginBase.MainForm.Documents)
218217
{
219-
ScintillaControl sci = documents[i].SciControl;
218+
ScintillaControl sci = document.SciControl;
220219
if (sci == null) continue;
221220
if (sci.FileName.Equals(filefullpath, StringComparison.OrdinalIgnoreCase))
222221
{

FlashDevelop/MainForm.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -644,13 +644,12 @@ public DockContent OpenEditableDocument(String org, Encoding encoding, Boolean r
644644
}
645645
try
646646
{
647-
Int32 count = this.Documents.Length;
648-
for (Int32 i = 0; i < count; i++)
647+
foreach (ITabbedDocument doc in this.Documents)
649648
{
650-
if (this.Documents[i].IsEditable && this.Documents[i].FileName.ToUpper() == file.ToUpper())
649+
if (doc.IsEditable && doc.FileName.ToUpper() == file.ToUpper())
651650
{
652-
this.Documents[i].Activate();
653-
return null;
651+
doc.Activate();
652+
return doc as DockContent;
654653
}
655654
}
656655
}

FlashDevelop/Managers/TabbingManager.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,11 @@ private static void OnTabTimer(Object sender, System.EventArgs e)
4141
/// </summary>
4242
public static void UpdateSequentialIndex(ITabbedDocument document)
4343
{
44-
Int32 count = Globals.MainForm.Documents.Length;
44+
ITabbedDocument[] documents = Globals.MainForm.Documents;
45+
Int32 count = documents.Length;
4546
for (Int32 i = 0; i < count; i++)
4647
{
47-
if (document == Globals.MainForm.Documents[i])
48+
if (document == documents[i])
4849
{
4950
SequentialIndex = i;
5051
return;

PluginCore/PluginCore/Managers/DocumentManager.cs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public static void MoveDocuments(String oldPath, String newPath)
6666
foreach (ITabbedDocument document in PluginBase.MainForm.Documents)
6767
{
6868
/* We need to check for virtual models, another more generic option would be
69-
* Path.GetFileName(document.FileName).IndexOfAny(Path.GetInvalidFileNameChars()) == -1
69+
* Path.GetFileName(document.FileName).IndexOfAny(Path.GetInvalidFileNameChars()) == -1
7070
* But this one is used in more places */
7171
if (document.IsEditable && !document.Text.StartsWith("[model] "))
7272
{
@@ -114,13 +114,11 @@ public static void ActivateDocument(Int32 index)
114114
/// </summary>
115115
public static ITabbedDocument FindDocument(String filename)
116116
{
117-
Int32 count = PluginBase.MainForm.Documents.Length;
118-
for (Int32 i = 0; i < count; i++)
117+
foreach (ITabbedDocument document in PluginBase.MainForm.Documents)
119118
{
120-
ITabbedDocument current = PluginBase.MainForm.Documents[i];
121-
if (current.IsEditable && current.FileName == filename)
119+
if (document.IsEditable && document.FileName == filename)
122120
{
123-
return current;
121+
return document;
124122
}
125123
}
126124
return null;
@@ -131,13 +129,11 @@ public static ITabbedDocument FindDocument(String filename)
131129
/// </summary>
132130
public static ITabbedDocument FindDocument(ScintillaControl sci)
133131
{
134-
Int32 count = PluginBase.MainForm.Documents.Length;
135-
for (Int32 i = 0; i < count; i++)
132+
foreach (ITabbedDocument document in PluginBase.MainForm.Documents)
136133
{
137-
ITabbedDocument current = PluginBase.MainForm.Documents[i];
138-
if (current.IsEditable && current.SciControl == sci)
134+
if (document.IsEditable && document.SciControl == sci)
139135
{
140-
return current;
136+
return document;
141137
}
142138
}
143139
return null;

0 commit comments

Comments
 (0)