Robot-merge branch net223-shakhov-bugfix into net223 by Ivan.Shakhov …

…<[email protected]>
JetBrains · Nov 28, 2022 · c0eadd8 · c0eadd8
2 parents 75e8eb4 + 3060834
commit c0eadd8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -122,7 +122,7 @@ private InputActionsDeclaredElement CreateDeclaredElements(IPsiSourceFile source
         public IEnumerable<InputActionsDeclaredElement> 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);
         }
 

diff --git 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