From e730a97154884166943d4a1103c15fefe51740a8 Mon Sep 17 00:00:00 2001 From: Ivan Shakhov Date: Fri, 25 Nov 2022 14:31:43 +0100 Subject: [PATCH 1/2] fix FindUsages for RIDER-85555 Include `inputactions` file into csproj and generate .Player projects --- .../src/Unity/InputActions/Psi/Caches/InputActionsCache.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resharper/resharper-unity/src/Unity/InputActions/Psi/Caches/InputActionsCache.cs b/resharper/resharper-unity/src/Unity/InputActions/Psi/Caches/InputActionsCache.cs index 771e78ef5a..79806761aa 100644 --- a/resharper/resharper-unity/src/Unity/InputActions/Psi/Caches/InputActionsCache.cs +++ b/resharper/resharper-unity/src/Unity/InputActions/Psi/Caches/InputActionsCache.cs @@ -122,7 +122,7 @@ private InputActionsDeclaredElement CreateDeclaredElements(IPsiSourceFile source public IEnumerable GetDeclaredElements(VirtualFileSystemPath file, string name) { myShellLocks.AssertReadAccessAllowed(); - var list = myDeclaredElements.Single(a => a.Key.GetLocation() == file).Value; + var list = myDeclaredElements.Where(a => a.Key.GetLocation() == file).SelectMany(a=>a.Value); // https://youtrack.jetbrains.com/issue/RIDER-85555/Include-inputactions-file-into-csproj-and-generate-.Player-projects return list.Where(element => element.ShortName == name); } From 30608348d0470a02d59055d726950e65ef435389 Mon Sep 17 00:00:00 2001 From: "Ivan.Shakhov" Date: Mon, 28 Nov 2022 14:25:46 +0100 Subject: [PATCH 2/2] better names for groups in Unity toolbar, fix RIDER-85088 --- .../resources/messages/UnityPluginActionsBundle.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rider/src/main/resources/messages/UnityPluginActionsBundle.properties b/rider/src/main/resources/messages/UnityPluginActionsBundle.properties index fbc2f1ed32..827c6f3313 100644 --- a/rider/src/main/resources/messages/UnityPluginActionsBundle.properties +++ b/rider/src/main/resources/messages/UnityPluginActionsBundle.properties @@ -56,6 +56,9 @@ action.UnityToolbarLabel.text=Unity: action.com.jetbrains.rider.plugins.unity.actions.ShowFileInUnityAction.text=Show in Unity action.com.jetbrains.rider.plugins.unity.actions.ShowFileInUnityFromExplorerAction.text=Unity +group.UnityToolbarActions.text=Unity Toolbar Actions +group.NewUI_UnityToolbarActions.text=Unity Toolbar Actions Base + configurable.name.unity.engine=Unity Engine #LogView