mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-16 01:45:11 +00:00
138 lines
5.9 KiB
Diff
138 lines
5.9 KiB
Diff
From f4c599a48d153d15ccb1879ff511617c8e310515 Mon Sep 17 00:00:00 2001
|
||
From: David McFarland <corngood@gmail.com>
|
||
Date: Sat, 10 Aug 2024 23:14:12 -0300
|
||
Subject: [PATCH 1/2] use files for unicode character database
|
||
|
||
---
|
||
.../BiDiClassTestDataGenerator.cs | 1 -
|
||
.../TextFormatting/BiDiTestDataGenerator.cs | 1 -
|
||
.../GraphemeBreakClassTrieGenerator.cs | 1 -
|
||
.../GraphemeBreakTestDataGenerator.cs | 1 -
|
||
.../LineBreakEnumuratorTests.cs | 1 -
|
||
.../TextFormatting/UnicodeDataGenerator.cs | 28 +++++++++++++++++--
|
||
.../TextFormatting/UnicodeEnumsGenerator.cs | 1 -
|
||
7 files changed, 26 insertions(+), 8 deletions(-)
|
||
|
||
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs
|
||
index f6b01d737..bc7278ef8 100644
|
||
--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs
|
||
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs
|
||
@@ -3,7 +3,6 @@
|
||
using System.Collections.Generic;
|
||
using System.IO;
|
||
using System.Linq;
|
||
-using System.Net.Http;
|
||
using Avalonia.Base.UnitTests.Media.TextFormatting;
|
||
|
||
namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
|
||
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs
|
||
index 28d37130a..5e26edf49 100644
|
||
--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs
|
||
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs
|
||
@@ -3,7 +3,6 @@
|
||
using System.Collections.Generic;
|
||
using System.IO;
|
||
using System.Linq;
|
||
-using System.Net.Http;
|
||
using Avalonia.Base.UnitTests.Media.TextFormatting;
|
||
using Avalonia.Media.TextFormatting.Unicode;
|
||
|
||
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs
|
||
index 1a8d41caa..185b6ea62 100644
|
||
--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs
|
||
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakClassTrieGenerator.cs
|
||
@@ -1,7 +1,6 @@
|
||
using System;
|
||
using System.Collections.Generic;
|
||
using System.IO;
|
||
-using System.Net.Http;
|
||
using System.Text.RegularExpressions;
|
||
using Avalonia.Media.TextFormatting.Unicode;
|
||
|
||
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakTestDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakTestDataGenerator.cs
|
||
index 029f8e236..44c2aaf6a 100644
|
||
--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakTestDataGenerator.cs
|
||
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakTestDataGenerator.cs
|
||
@@ -3,7 +3,6 @@
|
||
using System.Collections.Generic;
|
||
using System.IO;
|
||
using System.Linq;
|
||
-using System.Net.Http;
|
||
using Avalonia.Base.UnitTests.Media.TextFormatting;
|
||
|
||
namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
|
||
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
|
||
index 3db9a32b6..b8df1f446 100644
|
||
--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
|
||
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
|
||
@@ -3,7 +3,6 @@
|
||
using System.Collections.Generic;
|
||
using System.IO;
|
||
using System.Linq;
|
||
-using System.Net.Http;
|
||
using Avalonia.Media.TextFormatting;
|
||
using Avalonia.Media.TextFormatting.Unicode;
|
||
using Xunit;
|
||
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs
|
||
index f05a1e574..7e698ae0a 100644
|
||
--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs
|
||
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs
|
||
@@ -1,16 +1,40 @@
|
||
using System;
|
||
using System.Collections.Generic;
|
||
using System.IO;
|
||
-using System.Net.Http;
|
||
using System.Text.RegularExpressions;
|
||
+using System.Threading.Tasks;
|
||
using Avalonia.Media.TextFormatting.Unicode;
|
||
using Xunit;
|
||
|
||
namespace Avalonia.Base.UnitTests.Media.TextFormatting
|
||
{
|
||
+ class HttpContent : IDisposable {
|
||
+ readonly string url;
|
||
+ public HttpContent(string url) => this.url = url;
|
||
+
|
||
+ public void Dispose() {}
|
||
+ public Task<Stream> ReadAsStreamAsync() =>
|
||
+ Task.FromResult<Stream>(File.OpenRead(url));
|
||
+ }
|
||
+
|
||
+ class HttpResponseMessage : IDisposable {
|
||
+ HttpContent content;
|
||
+ public HttpResponseMessage(string url) => Content = new(url);
|
||
+
|
||
+ public void Dispose() {}
|
||
+ public bool IsSuccessStatusCode => true;
|
||
+ public HttpContent Content { get; init; }
|
||
+ }
|
||
+
|
||
+ class HttpClient : IDisposable {
|
||
+ public void Dispose() {}
|
||
+ public Task<HttpResponseMessage> GetAsync(string url) =>
|
||
+ Task.FromResult<HttpResponseMessage>(new (url));
|
||
+ }
|
||
+
|
||
internal static class UnicodeDataGenerator
|
||
{
|
||
- public const string Ucd = "https://www.unicode.org/Public/15.0.0/ucd/";
|
||
+ public static readonly string Ucd = Environment.GetEnvironmentVariable("UNICODE_CHARACTER_DATABASE");
|
||
|
||
public static UnicodeTrie GenerateBiDiTrie(out BiDiDataEntries biDiDataEntries, out Dictionary<int, BiDiDataItem> biDiData)
|
||
{
|
||
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs
|
||
index 110e57cbd..7073ea508 100644
|
||
--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs
|
||
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs
|
||
@@ -2,7 +2,6 @@
|
||
using System.Collections.Generic;
|
||
using System.IO;
|
||
using System.Linq;
|
||
-using System.Net.Http;
|
||
|
||
namespace Avalonia.Base.UnitTests.Media.TextFormatting
|
||
{
|
||
--
|
||
2.42.2
|
||
|