Skip to content

A Swiss Army knife for developers.

Fixed WASM in Release mode.

Etienne Baudoux4117fcfcdc53
diff --git a/src/app/dev/DevToys.MonacoEditor/LinkerConfig.xml b/src/app/dev/DevToys.MonacoEditor/LinkerConfig.xml
index 65696b09d..7a7ef3d14 100644
--- a/src/app/dev/DevToys.MonacoEditor/LinkerConfig.xml
+++ b/src/app/dev/DevToys.MonacoEditor/LinkerConfig.xml
@@ -3,24 +3,7 @@
<assembly fullname="Microsoft.Extensions.Options" />
<assembly fullname="DevToys.MonacoEditor">
- <type fullname="DevToys.MonacoEditor.WebInterop.DebugLogger">
- <method signature="System.Void log(System.String)" />
- </type>
- <type fullname="DevToys.MonacoEditor.WebInterop.ParentAccessor">
- <method signature="System.Object getValue(System.String)" />
- <method signature="System.Void setValue(System.String,System.String)" />
- <method signature="System.Void setValueWithType(System.String,System.String,System.String)" />
- <method signature="System.Void getJsonValue(System.String,System.String)" />
- <method signature="System.Boolean callAction(System.String)" />
- <method signature="System.Boolean callActionWithParameters(System.String,System.String,System.String)" />
- <method signature="System.Void callActionWithParameters(System.String,System.String,System.String,System.String)" />
- <method signature="System.Void close()" />
- </type>
- <type fullname="DevToys.MonacoEditor.WebInterop.ThemeListener">
- <method signature="System.Void getAccentColorHtmlHex(System.String)" />
- <method signature="System.Void getCurrentThemeName(System.String)" />
- <method signature="System.Void getIsHighContrast(System.String)" />
- </type>
+ <type fullname="DevToys.MonacoEditor*" />
</assembly>
<assembly fullname="System.Core">
diff --git a/src/app/dev/DevToys.MonacoEditor/Monaco/Editor/IActionDescriptor.cs b/src/app/dev/DevToys.MonacoEditor/Monaco/Editor/IActionDescriptor.cs
index b5c449163..fcb2bcdb7 100644
--- a/src/app/dev/DevToys.MonacoEditor/Monaco/Editor/IActionDescriptor.cs
+++ b/src/app/dev/DevToys.MonacoEditor/Monaco/Editor/IActionDescriptor.cs
@@ -1,11 +1,5 @@
using Newtonsoft.Json;
-#if !NETSTANDARD2_0
-using System.Runtime.InteropServices.WindowsRuntime;
-#else
-using ReadOnlyArrayAttribute = Monaco.Helpers.Stubs.ReadOnlyArrayAttribute;
-#endif
-
namespace DevToys.MonacoEditor.Monaco.Editor;
/// <summary>
@@ -53,5 +47,5 @@ public interface IActionDescriptor
[JsonProperty("precondition", NullValueHandling = NullValueHandling.Ignore)]
string Precondition { get; }
- void Run(CodeEditor editor, [ReadOnlyArray] object[] args);
+ void Run(CodeEditor editor, object[] args);
}
diff --git a/src/app/dev/DevToys.MonacoEditor/Monaco/IMarkdownString.cs b/src/app/dev/DevToys.MonacoEditor/Monaco/IMarkdownString.cs
index c9a00b975..2089f5f51 100644
--- a/src/app/dev/DevToys.MonacoEditor/Monaco/IMarkdownString.cs
+++ b/src/app/dev/DevToys.MonacoEditor/Monaco/IMarkdownString.cs
@@ -40,12 +40,12 @@ public static class MarkdownStringExtensions
return new IMarkdownString(svalue, isTrusted);
}
- public static IMarkdownString[] ToMarkdownString([ReadOnlyArray] this string[] values)
+ public static IMarkdownString[] ToMarkdownString(this string[] values)
{
return ToMarkdownString(values, false);
}
- public static IMarkdownString[] ToMarkdownString([ReadOnlyArray] this string[] values, bool isTrusted)
+ public static IMarkdownString[] ToMarkdownString(this string[] values, bool isTrusted)
{
return values.Select(value => new IMarkdownString(value, isTrusted)).ToArray();
}
diff --git a/src/app/dev/DevToys.MonacoEditor/Monaco/Languages/Hover.cs b/src/app/dev/DevToys.MonacoEditor/Monaco/Languages/Hover.cs
index aaae148e7..9889408be 100644
--- a/src/app/dev/DevToys.MonacoEditor/Monaco/Languages/Hover.cs
+++ b/src/app/dev/DevToys.MonacoEditor/Monaco/Languages/Hover.cs
@@ -1,11 +1,5 @@
using Newtonsoft.Json;
-#if !NETSTANDARD2_0
-using System.Runtime.InteropServices.WindowsRuntime;
-#else
-using ReadOnlyArrayAttribute = Monaco.Helpers.Stubs.ReadOnlyArrayAttribute;
-#endif
-
namespace DevToys.MonacoEditor.Monaco.Languages;
/// <summary>
@@ -28,9 +22,9 @@ public sealed class Hover
[JsonProperty("range", NullValueHandling = NullValueHandling.Ignore)]
public IRange Range { get; set; }
- public Hover([ReadOnlyArray] string[] contents, IRange range) : this(contents, range, false) { }
+ public Hover(string[] contents, IRange range) : this(contents, range, false) { }
- public Hover([ReadOnlyArray] string[] contents, IRange range, bool isTrusted)
+ public Hover(string[] contents, IRange range, bool isTrusted)
{
Contents = contents.ToMarkdownString(isTrusted);
Range = range;
diff --git a/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/ParentAccessor.cs b/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/ParentAccessor.cs
index 50a47da7d..d1b8afa8f 100644
--- a/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/ParentAccessor.cs
+++ b/src/app/dev/DevToys.MonacoEditor/WebInterop/Parent/ParentAccessor.cs
@@ -1,5 +1,4 @@
using System.Reflection;
-using System.Runtime.InteropServices.WindowsRuntime;
using Newtonsoft.Json;
using Windows.Foundation.Metadata;
@@ -72,7 +71,7 @@ internal sealed partial class ParentAccessor : IDisposable
/// <param name="name">Name of event to call.</param>
/// <param name="parameters">JSON string Parameters.</param>
/// <returns></returns>
- public Task<string> CallEvent(string name, [ReadOnlyArray] string[] parameters)
+ public Task<string> CallEvent(string name, string[] parameters)
{
Debug.WriteLine($"Event {name}");
if (_events.ContainsKey(name))
@@ -116,7 +115,7 @@ internal sealed partial class ParentAccessor : IDisposable
/// <param name="name">String Key.</param>
/// <param name="parameters">Parameters to be passed to Action.</param>
/// <returns>True if method was found in registration.</returns>
- public bool CallActionWithParameters(string name, [ReadOnlyArray] string[] parameters)
+ public bool CallActionWithParameters(string name, string[] parameters)
{
if (_actionParameters.ContainsKey(name))
{