Skip to content

Commit 655cbc4

Browse files
authored
Merge pull request #22 from boriel-basic/feature/put_debug_labels_in_sepparated_lines
feat: put debug labels in separated lines
2 parents dfcab26 + ba10f64 commit 655cbc4

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

ZXBStudio/BuildSystem/ZXCodeFile.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
using Avalonia.Svg.Skia;
2-
using System;
1+
using System;
32
using System.Collections.Generic;
43
using System.IO;
54
using System.Linq;
6-
using System.Reflection.Metadata;
75
using System.Text;
86
using System.Text.RegularExpressions;
9-
using System.Threading.Tasks;
10-
using ZXBasicStudio.Classes;
117
using ZXBasicStudio.DocumentModel.Classes;
128
using ZXBasicStudio.IntegratedDocumentTypes.CodeDocuments.Basic;
139

@@ -99,6 +95,11 @@ void ContentCleanup()
9995
Content = regRemoveEmpty.Replace(Content, "");
10096
}
10197

98+
private string GetSourceLine(int lineNum, string line)
99+
{
100+
return $"file__{FileGuid}__{lineNum}:\n{line}";
101+
}
102+
102103
public void CreateBuildFile(IEnumerable<ZXCodeFile> AllFiles)
103104
{
104105
string content = Content;
@@ -155,7 +156,7 @@ public void CreateBuildFile(IEnumerable<ZXCodeFile> AllFiles)
155156
else
156157
{
157158
sbSource.AppendLine(line);
158-
line = $"file__{FileGuid}__{lineIndex}: {line}";
159+
line = GetSourceLine(lineIndex, line);
159160
sb.AppendLine(line);
160161
}
161162

@@ -244,11 +245,11 @@ public void CreateBuildFile(IEnumerable<ZXCodeFile> AllFiles)
244245
}
245246
else if (inAsm && !regAsmExclude.IsMatch(line))
246247
{
247-
line = $"file__{FileGuid}__{buc}: {line}";
248+
line = GetSourceLine(buc, line);
248249
}
249250
else if (!inAsm && !string.IsNullOrWhiteSpace(line) && !regBasicExclude.IsMatch(line))
250251
{
251-
line = $"file__{FileGuid}__{buc}: {line}";
252+
line = GetSourceLine(buc, line);
252253
}
253254

254255
}

0 commit comments

Comments
 (0)