|
1 |
| -using Avalonia.Svg.Skia; |
2 |
| -using System; |
| 1 | +using System; |
3 | 2 | using System.Collections.Generic;
|
4 | 3 | using System.IO;
|
5 | 4 | using System.Linq;
|
6 |
| -using System.Reflection.Metadata; |
7 | 5 | using System.Text;
|
8 | 6 | using System.Text.RegularExpressions;
|
9 |
| -using System.Threading.Tasks; |
10 |
| -using ZXBasicStudio.Classes; |
11 | 7 | using ZXBasicStudio.DocumentModel.Classes;
|
12 | 8 | using ZXBasicStudio.IntegratedDocumentTypes.CodeDocuments.Basic;
|
13 | 9 |
|
@@ -99,6 +95,11 @@ void ContentCleanup()
|
99 | 95 | Content = regRemoveEmpty.Replace(Content, "");
|
100 | 96 | }
|
101 | 97 |
|
| 98 | + private string GetSourceLine(int lineNum, string line) |
| 99 | + { |
| 100 | + return $"file__{FileGuid}__{lineNum}:\n{line}"; |
| 101 | + } |
| 102 | + |
102 | 103 | public void CreateBuildFile(IEnumerable<ZXCodeFile> AllFiles)
|
103 | 104 | {
|
104 | 105 | string content = Content;
|
@@ -155,7 +156,7 @@ public void CreateBuildFile(IEnumerable<ZXCodeFile> AllFiles)
|
155 | 156 | else
|
156 | 157 | {
|
157 | 158 | sbSource.AppendLine(line);
|
158 |
| - line = $"file__{FileGuid}__{lineIndex}: {line}"; |
| 159 | + line = GetSourceLine(lineIndex, line); |
159 | 160 | sb.AppendLine(line);
|
160 | 161 | }
|
161 | 162 |
|
@@ -244,11 +245,11 @@ public void CreateBuildFile(IEnumerable<ZXCodeFile> AllFiles)
|
244 | 245 | }
|
245 | 246 | else if (inAsm && !regAsmExclude.IsMatch(line))
|
246 | 247 | {
|
247 |
| - line = $"file__{FileGuid}__{buc}: {line}"; |
| 248 | + line = GetSourceLine(buc, line); |
248 | 249 | }
|
249 | 250 | else if (!inAsm && !string.IsNullOrWhiteSpace(line) && !regBasicExclude.IsMatch(line))
|
250 | 251 | {
|
251 |
| - line = $"file__{FileGuid}__{buc}: {line}"; |
| 252 | + line = GetSourceLine(buc, line); |
252 | 253 | }
|
253 | 254 |
|
254 | 255 | }
|
|
0 commit comments