Skip to content

Commit 45b1514

Browse files
gusmanbgusmanb
authored
Merge pull request #60 from boriel-basic/fix/autocomplete
Autocomplete bugfix
2 parents 33212bf + cfd65e6 commit 45b1514

36 files changed

Lines changed: 1565 additions & 148 deletions

‎.github/ISSUE_TEMPLATE/bug_report.yaml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Bug Report
2+
description: File a bug report.
3+
title: "[Bug]: "
4+
labels: ["bug", "triage"]
5+
projects: ["boriel-basic/2"]
6+
assignees:
7+
- duefectu
8+
body:
9+
- type: markdown
10+
attributes:
11+
value: |
12+
Thanks for taking the time to fill out this bug report!
13+
- type: input
14+
id: contact
15+
attributes:
16+
label: Contact Details
17+
description: How can we get in touch with you if we need more info?
18+
placeholder: e.g. Telegram @nickname
19+
validations:
20+
required: false
21+
- type: input
22+
id: version
23+
attributes:
24+
label: IDE version
25+
description: |
26+
Always check you have the latest version.
27+
placeholder: 0.2-beta
28+
validations:
29+
required: true
30+
- type: textarea
31+
id: what-happened
32+
attributes:
33+
label: What happened?
34+
description: Also tell us, what did you expect to happen?
35+
placeholder: Tell us what you see!
36+
validations:
37+
required: true
38+
- type: textarea
39+
id: logs
40+
attributes:
41+
label: Error and Warning messages
42+
description: |
43+
Please copy and paste any relevant log output.
44+
This will be automatically formatted into code, so no need for backticks.
45+
render: shell
46+
- type: checkboxes
47+
id: terms
48+
attributes:
49+
label: Code of Conduct
50+
description: By submitting this issue, you agree to follow our [Code of Conduct](https://boriel-basic/zxbasic/blob/main/CODE_OF_CONDUCT.md).
51+
options:
52+
- label: I agree to follow this project's Code of Conduct
53+
required: true

‎Bufdio/Bufdio.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
88
<Platforms>AnyCPU;x64</Platforms>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="FFmpeg.AutoGen" Version="5.1.1" />
12+
<PackageReference Include="FFmpeg.AutoGen" Version="6.1.0.1" />
1313
</ItemGroup>
1414

1515
</Project>

‎CoreSpectrum/CoreSpectrum.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>

‎HeadlessEmulator/HeadlessEmulator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>

‎MsBox.Avalonia/AttachadProperty/HyperLinkCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using System.Reactive;
21
using System.Windows.Input;
32
using Avalonia;
43
using Avalonia.Data;
54
using Avalonia.Input;
65
using Avalonia.Interactivity;
6+
using Avalonia.Reactive;
77

88
namespace MsBox.Avalonia.AttachadProperty;
99

‎MsBox.Avalonia/MsBox.Avalonia.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<RepositoryUrl>messagebox.avalonia</RepositoryUrl>
1111
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1212
<PackageTags>Avalonia MessageBox</PackageTags>
13-
<TargetFramework>netstandard2.0</TargetFramework>
13+
<TargetFramework>netstandard2.1</TargetFramework>
1414
<LangVersion>latest</LangVersion>
1515
<SignAssembly>true</SignAssembly>
1616
<AssemblyOriginatorKeyFile>strong-key.snk</AssemblyOriginatorKeyFile>
@@ -26,8 +26,9 @@
2626
<AvaloniaResource Include="Assets\*" />
2727
</ItemGroup>
2828
<ItemGroup>
29-
<PackageReference Include="Avalonia" Version="11.0.6" />
30-
<PackageReference Include="DialogHost.Avalonia" Version="0.7.7" />
29+
<PackageReference Include="Avalonia" Version="11.2.3" />
30+
<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
31+
<PackageReference Include="DialogHost.Avalonia" Version="0.9.2" />
3132
<PackageReference Include="Markdown.Avalonia.Tight" Version="11.0.2" />
3233
</ItemGroup>
3334
<ItemGroup>

‎Rom128Reconstructor/Rom128Reconstructor.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>

‎RomReconstructor/RomReconstructor.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<Platforms>AnyCPU;x64</Platforms>

‎Z80dotNet/Main/Main.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<Platforms>AnyCPU;x64</Platforms>
88
</PropertyGroup>

‎ZXBStudio/BuildSystem/ZXProjectBuilder.cs‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,9 @@ private static void CheckNextCreator()
331331
OutputLogWritter.WriteLine("Building map files...");
332332

333333
foreach (var file in files)
334+
{
334335
file.CreateBuildFile(files);
336+
}
335337

336338
OutputLogWritter.WriteLine("Building program map...");
337339

@@ -344,7 +346,10 @@ private static void CheckNextCreator()
344346
return null;
345347
}
346348

347-
var proc = Process.Start(new ProcessStartInfo(Path.GetFullPath(ZXOptions.Current.ZxbcPath), $"\"{Path.Combine(codeFile.Directory, codeFile.TempFileName)}\" -M MEMORY_MAP " + args) { WorkingDirectory = project.ProjectPath, RedirectStandardError = true, CreateNoWindow = true });
349+
var proc = Process.Start(
350+
new ProcessStartInfo(
351+
Path.GetFullPath(ZXOptions.Current.ZxbcPath),
352+
$"\"{Path.Combine(codeFile.Directory, codeFile.TempFileName)}\" -M MEMORY_MAP " + args) { WorkingDirectory = project.ProjectPath, RedirectStandardError = true, CreateNoWindow = true });
348353

349354
OutputProcessLog(OutputLogWritter, proc, out logOutput);
350355

@@ -364,7 +369,22 @@ private static void CheckNextCreator()
364369

365370
OutputLogWritter.WriteLine("Building variable map...");
366371

367-
proc = Process.Start(new ProcessStartInfo(Path.GetFullPath(ZXOptions.Current.ZxbcPath), $"\"{Path.Combine(codeFile.Directory, codeFile.TempFileName)}\" -E " + args) { WorkingDirectory = project.ProjectPath, RedirectStandardError = true, CreateNoWindow = true });
372+
// DUEFECTU: 2024.09.11 -> Force .ic extension for debug
373+
//proc = Process.Start(new ProcessStartInfo(Path.GetFullPath(ZXOptions.Current.ZxbcPath), $"\"{Path.Combine(codeFile.Directory, codeFile.TempFileName)}\" -E " + args) { WorkingDirectory = project.ProjectPath, RedirectStandardError = true, CreateNoWindow = true });
374+
var pi = new ProcessStartInfo();
375+
pi.WorkingDirectory = project.ProjectPath;
376+
pi.RedirectStandardError = true;
377+
pi.CreateNoWindow = true;
378+
// Compile command
379+
var tempFileName = Path.Combine(codeFile.Directory, codeFile.TempFileName);
380+
var debugFile = Path.GetFileNameWithoutExtension(tempFileName) + ".ic"; // force .ic extension
381+
pi.FileName = Path.GetFullPath(ZXOptions.Current.ZxbcPath); // ZXBC.exe
382+
pi.Arguments = string.Format("\"{0}\" -E -o {1} {2}",
383+
tempFileName, // Main project file
384+
debugFile, // Debug file
385+
args); // user arguments
386+
// Go for it
387+
proc = Process.Start(pi);
368388

369389
OutputProcessLog(OutputLogWritter, proc, out logOutput);
370390

0 commit comments

Comments
 (0)