Robot-merge branch net231 into net231_meta_tracker_shakhov by Ivan.Shakhov <[email protected]>

Author: Merge Robot

CHANGELOG.md

@@ -10,11 +10,67 @@ Since 2018.1, the version numbers and release cycle match Rider's versions and r
 
 ## 2023.1.0
 * [Commits](https://github.com/JetBrains/resharper-unity/compare/net223...net231)
+* [Milestone](https://github.com/JetBrains/resharper-unity/milestone/58?closed=1)
+
+### Added
+
+- Add context action and Generate menu item to generate baker and authoring classes from DOTS component data ([RIDER-85175](https://youtrack.jetbrains.com/issue/RIDER-85175))
+- Add file templates for DOTS component data, systems, aspects and entity jobs ([RIDER-85180](https://youtrack.jetbrains.com/issue/RIDER-85180))
+- Add inspection to check that `ComponentLookup` is updated in a system ([RIDER-85179](https://youtrack.jetbrains.com/issue/RIDER-85179))
+- Add quick fix to add a call to `ComponentLookup.Update` in a system's `OnUpdate` method ([RIDER-85179](https://youtrack.jetbrains.com/issue/RIDER-85179))
+- Add inspection and quick fix to ensure that a system calling `GetSingleton` has a corresponding call to `RequireForUpdate` ([RIDER-85181](https://youtrack.jetbrains.com/issue/RIDER-85181))
+- Add Find Usages support for methods used implicitly in animation clips ([RIDER-77030](https://youtrack.jetbrains.com/issue/RIDER-77030))
+- Add custom formatting rules to keep `[Header]` attribute on separate line ([RIDER-71840](https://youtrack.jetbrains.com/issue/RIDER-71840))
+- Rider: Provide link to online help for types and type members in Unity packages ([RIDER-86917](https://youtrack.jetbrains.com/issue/RIDER-86917))
+
+### Changed
+
+- Serialised fields are now accurately recognised in any class, not just known Unity types ([RIDER-79871](https://youtrack.jetbrains.com/issue/RIDER-79871), [RIDER-72838](https://youtrack.jetbrains.com/issue/RIDER-72838))
+- Re-evaluate resource warnings when a resource file is updated or deleted
+- Improve support for prefab modifications and event handlers
+- Rider: Allow static methods for `EventTrigger` usages
+- Rider: Update icons for `.asmdef`, `.asmref` and `.inputactions` files ([RIDER-68006](https://youtrack.jetbrains.com/issue/RIDER-68006))
+- Rider: Update Unity Explorer UI for new search experience ([RIDER-82417](https://youtrack.jetbrains.com/issue/RIDER-82417))
+- Rider: "ECS system" Code Vision lens renamed to "DOTS" ([RIDER-87790](https://youtrack.jetbrains.com/issue/RIDER-87790))
+
+### Fixed
+
+- Fix asset usages for package scripts and assets ([RIDER-85431](https://youtrack.jetbrains.com/issue/RIDER-85431))
+- Fix method usage inside `EventTrigger` prefab modification ([RIDER-47693](https://youtrack.jetbrains.com/issue/RIDER-47693))
+- Fix warning when a partial DOTS class and its generated part both declare the same base class ([RIDER-87055](https://youtrack.jetbrains.com/issue/RIDER-87055))
+- Fix exception when adding performance indicators ([RIDER-87523](https://youtrack.jetbrains.com/issue/RIDER-87523))
+- Fix memory leak when showing usages of code in Unity editor tool window ([RIDER-87538](https://youtrack.jetbrains.com/issue/RIDER-87538))
+- Fix indexing project settings and assembly definitions when asset indexing is disabled ([RIDER-87363](https://youtrack.jetbrains.com/issue/RIDER-87363))
+- Rider: Fix unable to find usages or `.asmdef` files when player projects generated ([RIDER-71238](https://youtrack.jetbrains.com/issue/RIDER-71238))
+- Rider: Fix completion list showing duplicate entries when player projects generated ([RIDER-75500](https://youtrack.jetbrains.com/issue/RIDER-75500))
+- Rider: Fix "Attach to Unity" run configuration form to resize gracefully ([RIDER-84643](https://youtrack.jetbrains.com/issue/RIDER-75500))
+- Rider: Fix online documentation URL for nested classes
+- Rider: Fix Unity Log view losing selected item when search field is cleared ([#2381](https://github.com/JetBrains/resharper-unity/issues/2381))
+- Rider: Fix issue with UnityYamlMerge not being called ([RIDER-87413](https://youtrack.jetbrains.com/issue/RIDER-87413))
+
+
+
+## 2022.3.1
+* Released: [2022-12-21](https://blog.jetbrains.com/dotnet/2022/12/21/resharper-and-rider-2022-3-1-bug-fixes/)
+* Build: 2022.3.0.191
+* [Commits](https://github.com/JetBrains/resharper-unity/compare/net223-rtm-2022.3.0...net223-rtm-2022.3.1)
 * [Milestone](https://github.com/JetBrains/resharper-unity/milestone/57?closed=1)
+* [GitHub release](https://github.com/JetBrains/resharper-unity/releases/tag/net223-rtm-2022.3.1)
+* [ReSharper release](https://resharper-plugins.jetbrains.com/packages/JetBrains.Unity/2022.3.0.191)
+
+### Fixed
+
+- Rider: Stop ranking resource string literals with ML completion ([RIDER-85858](https://youtrack.jetbrains.com/issue/RIDER-85858))
+
+
 
 ## 2022.3.0
-* [Commits](https://github.com/JetBrains/resharper-unity/compare/net222...net223)
+* Released: [2022-12-07](https://blog.jetbrains.com/dotnet/2022/12/07/rider-2022-3/)
+* Build: 2022.3.0.183
+* [Commits](https://github.com/JetBrains/resharper-unity/compare/net222...net223-rtm-2022.3.0)
 * [Milestone](https://github.com/JetBrains/resharper-unity/milestone/55?closed=1)
+* [GitHub release](https://github.com/JetBrains/resharper-unity/releases/tag/net223-rtm-2022.3.0)
+* [ReSharper release](https://resharper-plugins.jetbrains.com/packages/JetBrains.Unity/2022.3.0.183)
 
 ### Added
 
@@ -63,6 +119,15 @@ Since 2018.1, the version numbers and release cycle match Rider's versions and r
 - Rider: Fix issue reading packages with up-to-date but disabled `packages-lock.json` ([RIDER-81728](https://youtrack.jetbrains.com/issue/RIDER-81728), [#2355](https://github.com/JetBrains/resharper-unity/pull/2355))
 - Rider: Reduce overhead of checking for Android functionality
 - Rider: Improve startup time for very large projects when asset indexing disabled ([RIDER-83398](https://youtrack.jetbrains.com/issue/RIDER-83398))
+- Rider: Fix error when trying to invoke "Start Unity" action ([RIDER-85383](https://youtrack.jetbrains.com/issue/RIDER-85383))
+- Rider: Fix error starting Unity from toolbar if Android plugin is installed ([RIDER-85695](https://youtrack.jetbrains.com/issue/RIDER-85695))
+
+
+
+## 2022.2.4
+* Released: [2022-11-08](https://blog.jetbrains.com/dotnet/2022/11/08/resharper-and-rider-2022-2-4-bug-fix/)
+* Build: 2022.2.3.184
+* No code changes
 
 
 

resharper/resharper-unity/src/PackagesLock.targets

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <ItemGroup>
-        <PackageLock Include="CitizenMatt.ReSharper.LiveTemplateCompiler" Version="3.2.0" />
         <PackageLock Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.2" IsDevelopmentDependency="True" />
     </ItemGroup>
-</Project>
+</Project>

resharper/resharper-unity/src/Unity.Rider/Common/CSharp/Daemon/CodeInsights/UnityCodeInsightFieldUsageProvider.cs

@@ -1,3 +1,5 @@
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -59,7 +61,8 @@ public class UnityCodeInsightFieldUsageProvider : AbstractUnityCodeInsightProvid
         public override ICollection<CodeVisionRelativeOrdering> RelativeOrderings =>
             new[] {new CodeVisionRelativeOrderingLast()};
 
-        public UnityCodeInsightFieldUsageProvider(IFrontendBackendHost frontendBackendHost, BulbMenuComponent bulbMenu,
+        public UnityCodeInsightFieldUsageProvider(IFrontendBackendHost frontendBackendHost,
+                                                  BulbMenuComponent bulbMenu,
                                                   DeferredCacheController deferredCacheController,
                                                   AssetInspectorValuesContainer inspectorValuesContainer,
                                                   UnityEventsElementContainer unityEventsElementContainer)
@@ -117,7 +120,7 @@ public void AddInspectorHighlighting(IHighlightingConsumer consumer, ICSharpDecl
             IDeclaredElement declaredElement, string baseDisplayName, string baseTooltip, string moreText, IconModel iconModel,
             IEnumerable<BulbMenuItem> items, List<CodeVisionEntryExtraActionModel> extraActions)
         {
-            string displayName = null;
+            string? displayName = null;
 
             var solution = element.GetSolution();
             Assertion.Assert(solution.Locks.IsReadAccessAllowed(), "ReadLock required");
@@ -174,8 +177,8 @@ public void AddInspectorHighlighting(IHighlightingConsumer consumer, ICSharpDecl
             }
 
 
-            var initializer = (element as IFieldDeclaration).NotNull("element as IFieldDeclaration != null").Initial;
-            var initValue = (initializer as IExpressionInitializer)?.Value?.ConstantValue.Value;
+            var initializer = (element as IFieldDeclaration).NotNull().Initial;
+            var initValue = (initializer as IExpressionInitializer)?.Value?.ConstantValue;
 
             var initValueUnityPresentation = GetUnitySerializedPresentation(presentationType, initValue);
 
@@ -246,24 +249,30 @@ private string GetTooltip(int changesCount, bool isEstimated, bool isUniqueChang
             return $"Changed in {changesCount} assets" + (isEstimated ? " + possible indirect changes" : "");
         }
 
-        private IAssetValue GetUnitySerializedPresentation(UnityPresentationType presentationType, object value)
+        private IAssetValue GetUnitySerializedPresentation(UnityPresentationType presentationType, ConstantValue? value)
         {
-            if (presentationType == UnityPresentationType.Bool && value is bool b)
+            var b = false;
+            if (presentationType == UnityPresentationType.Bool && (value == null || value.IsBoolean(out b)))
                 return b ? new AssetSimpleValue("1") : new AssetSimpleValue("0");
 
-            if (presentationType == UnityPresentationType.ScriptableObject && value == null)
+            if (presentationType == UnityPresentationType.ScriptableObject && (value == null || value.IsNull()))
                 return new AssetReferenceValue(new LocalReference(0, 0));
 
-            if (presentationType == UnityPresentationType.FileId && value == null)
+            if (presentationType == UnityPresentationType.FileId && (value == null || value.IsNull()))
                 return new AssetReferenceValue(new LocalReference(0, 0));
 
-            if ((presentationType == UnityPresentationType.OtherSimple  || presentationType == UnityPresentationType.Bool) && value == null)
+            if (presentationType is UnityPresentationType.OtherSimple or UnityPresentationType.Bool &&
+                (value == null || value.IsNull()))
+            {
                 return new AssetSimpleValue("0");
+            }
 
-            if (value == null)
+            if (value == null || value.IsNull())
                 return new AssetSimpleValue(string.Empty);
 
-            return new AssetSimpleValue(value.ToString());
+#pragma warning disable CS0618
+            return new AssetSimpleValue(value.Value?.ToString());
+#pragma warning restore CS0618
         }
 
         private UnityPresentationType GetUnityPresentationType(IType type)
@@ -321,4 +330,4 @@ public enum UnityPresentationType
             UnityEvent
         }
     }
-}
+}

resharper/resharper-unity/src/Unity.Rider/Integration/CSharp/Feature/Settings/AdditionalFileLayoutSettingsHelper.cs

@@ -1,10 +1,11 @@
+#nullable enable
+
 using System;
 using JetBrains.Application.Settings;
 using JetBrains.DataFlow;
 using JetBrains.Lifetimes;
 using JetBrains.ReSharper.Plugins.Unity.CSharp.Psi.CodeStyle;
 using JetBrains.ReSharper.Plugins.Unity.Rider.Resources;
-using JetBrains.Rider.Backend.Features.Dialog;
 using JetBrains.Rider.Backend.Features.Settings.OptionsPage.CSharpFileLayout;
 using JetBrains.Util;
 
@@ -17,25 +18,21 @@ public class AdditionalFileLayoutSettingsHelper
                                             "    \n" +
                                             "</Patterns>";
 
-        private static readonly object ourLocalChangeToken = new object();
+        private static readonly object ourLocalChangeToken = new();
 
-        private readonly RiderDialogHost myDialogHost;
         private readonly string myDefaultWithRegions;
         private readonly string myDefaultWithoutRegions;
 
-        public AdditionalFileLayoutSettingsHelper(in Lifetime lifetime, IContextBoundSettingsStore settingsContext,
-            RiderDialogHost dialogHost)
+        public AdditionalFileLayoutSettingsHelper(in Lifetime lifetime, IContextBoundSettingsStore settingsContext)
         {
-            myDialogHost = dialogHost;
-
             myDefaultWithoutRegions = AdditionalFileLayoutResources.DefaultAdditionalFileLayoutPatterns.ReplaceNewLines("\n");
             myDefaultWithRegions = AdditionalFileLayoutResources.DefaultAdditionalFileLayoutPatternsWithRegions.ReplaceNewLines("\n");
 
             var initialText = settingsContext.GetValue((AdditionalFileLayoutSettings s) => s.Pattern);
             if (initialText.IsNullOrEmpty()) initialText = AdditionalFileLayoutResources.DefaultAdditionalFileLayoutPatterns;
             initialText = initialText.ReplaceNewLines("\n");
 
-            Text = new Property<string>(lifetime, "AdditionalFileLayoutSettingsHelper.Text", initialText);
+            Text = new Property<string>("AdditionalFileLayoutSettingsHelper.Text", initialText);
 
             Text.Change.Advise_NoAcknowledgement(lifetime, args =>
             {
@@ -77,4 +74,4 @@ public void LoadDefaultPattern(DefaultPatternKind kind)
             }
         }
     }
-}
+}

resharper/resharper-unity/src/Unity.Rider/Integration/CSharp/Feature/Settings/UnityFileLayoutPageTab.cs

@@ -1,11 +1,11 @@
+#nullable enable
+
 using JetBrains.Application.UI.Options;
 using JetBrains.Application.UI.Options.OptionsDialog;
 using JetBrains.IDE.UI.Extensions;
 using JetBrains.IDE.UI.Extensions.Properties;
 using JetBrains.Lifetimes;
 using JetBrains.ReSharper.Plugins.Unity.Rider.Resources;
-using JetBrains.ReSharper.Plugins.Unity.Rider.Resources;
-using JetBrains.Rider.Backend.Features.Dialog;
 using JetBrains.Rider.Backend.Features.Settings.OptionsPage.CSharpFileLayout;
 using JetBrains.Rider.Model;
 using JetBrains.Rider.Model.UIAutomation;
@@ -15,22 +15,16 @@ namespace JetBrains.ReSharper.Plugins.Unity.Rider.Integration.CSharp.Feature.Set
     [OptionsComponent]
     public class UnityFileLayoutPageTab : IFileLayoutPageTab
     {
-        private readonly RiderDialogHost myDialogHost;
-        private readonly RdLanguage myFileLayoutLanguage = new RdLanguage("XML");
+        private readonly RdLanguage myFileLayoutLanguage = new("XML");
 
         private const string DummyFileName = "Dummy.filelayout";
 
-        public UnityFileLayoutPageTab(RiderDialogHost dialogHost)
-        {
-            myDialogHost = dialogHost;
-        }
-
         public string Title => "Unity";
 
         public BeControl Create(Lifetime lifetime, OptionsPageContext optionsPageContext,
                                 OptionsSettingsSmartContext optionsSettingsSmartContext)
         {
-            var fileLayoutSettings = new AdditionalFileLayoutSettingsHelper(lifetime, optionsSettingsSmartContext, myDialogHost);
+            var fileLayoutSettings = new AdditionalFileLayoutSettingsHelper(lifetime, optionsSettingsSmartContext);
             var textControl = BeControls.GetLanguageTextControl(fileLayoutSettings.Text, lifetime, false, myFileLayoutLanguage, DummyFileName, true);
             var toolbar = BeControls.GetToolbar(textControl);
 
@@ -49,4 +43,4 @@ public BeControl Create(Lifetime lifetime, OptionsPageContext optionsPageContext
             return grid.WithMargin(margin);
         }
     }
-}
+}

resharper/resharper-unity/src/Unity.Rider/Integration/Core/Caches/RiderDeferredCacheProgressBar.cs

@@ -1,5 +1,6 @@
+#nullable enable
+
 using System;
-using JetBrains.Annotations;
 using JetBrains.Application.Threading;
 using JetBrains.Application.Threading.Tasks;
 using JetBrains.Collections.Viewable;
@@ -18,9 +19,9 @@ public class RiderDeferredCacheProgressBar : DeferredCacheProgressBar
         private readonly Lifetime myLifetime;
         private readonly DeferredHelperCache myCache;
         private readonly IShellLocks myLocks;
-        [CanBeNull] private readonly BackgroundProgressManager myBackgroundProgressManager;
+        private readonly BackgroundProgressManager? myBackgroundProgressManager;
 
-        public RiderDeferredCacheProgressBar(Lifetime lifetime, DeferredHelperCache cache, IShellLocks locks, [CanBeNull] BackgroundProgressManager backgroundProgressManager = null)
+        public RiderDeferredCacheProgressBar(Lifetime lifetime, DeferredHelperCache cache, IShellLocks locks, BackgroundProgressManager? backgroundProgressManager = null)
             : base(lifetime, cache)
         {
             myLifetime = lifetime;
@@ -42,7 +43,7 @@ public override void Start(Lifetime startLifetime)
 
                 var count = myCache.FilesToProcess.Count;
                 var processedCount = 0;
-                var progress = new Property<double>(startLifetime, "DeferredCacheProgressBarProgress", 0);
+                var progress = new Property<double>("DeferredCacheProgressBarProgress", 0);
 
                 myCache.AfterRemoveFromProcess.Advise(startLifetime, _ =>
                 {
@@ -51,7 +52,7 @@ public override void Start(Lifetime startLifetime)
                         progress.Value = Math.Min(0.99, ((double) processedCount) / count);
                 });
 
-                var description = new Property<string>(startLifetime, "DeferredCacheProgressBarDescription", Strings.RiderDeferredCacheProgressBar_Start_Processing_assets);
+                var description = new Property<string>("DeferredCacheProgressBarDescription", Strings.RiderDeferredCacheProgressBar_Start_Processing_assets);
                 var task = BackgroundProgressBuilder.Create()
                     .WithTitle(Strings.RiderDeferredCacheProgressBar_Start_Calculating_asset_index)
                     .WithDescription(description)
@@ -65,4 +66,4 @@ public override void Start(Lifetime startLifetime)
             }
         }
     }
-}
+}

resharper/resharper-unity/src/Unity.Rider/Integration/Core/Feature/UnitTesting/RunViaUnityEditorStrategy.cs

@@ -1,3 +1,5 @@
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -39,8 +41,6 @@
 using Status = JetBrains.Rider.Model.Unity.BackendUnity.Status;
 using UnitTestLaunch = JetBrains.Rider.Model.Unity.BackendUnity.UnitTestLaunch;
 
-#nullable enable
-
 namespace JetBrains.ReSharper.Plugins.Unity.Rider.Integration.Core.Feature.UnitTesting
 {
     [SolutionComponent]
@@ -87,7 +87,7 @@ public RunViaUnityEditorStrategy(ISolution solution,
             myLifetime = lifetime;
             myPackageCompatibilityValidator = packageCompatibilityValidator;
 
-            myUnityProcessId = new Property<int?>(lifetime, "RunViaUnityEditorStrategy.UnityProcessId");
+            myUnityProcessId = new Property<int?>("RunViaUnityEditorStrategy.UnityProcessId");
 
             myUnityProcessId.ForEachValue_NotNull(lifetime, (lt, processId) =>
             {
@@ -188,8 +188,7 @@ private Task Run(IUnitTestRun run)
 
         private void RefreshAndRunTask(IUnitTestRun run, TaskCompletionSource<bool> tcs, Lifetime taskLifetime)
         {
-            var cancellationTs = run.GetData(ourCancellationTokenSourceKey)
-                .NotNull("run.GetData(ourCancellationTokenSourceKey) != null");
+            var cancellationTs = run.GetData(ourCancellationTokenSourceKey).NotNull();
             var cancellationToken = cancellationTs.Token;
 
             myLogger.Trace("Before calling Refresh.");
@@ -581,4 +580,4 @@ public override int GetHashCode()
             public bool IsUnmanaged => false;
         }
     }
-}
+}