Skip to content

Commit c0eadd8

Browse files
author
Merge Robot
committed
Robot-merge branch net223-shakhov-bugfix into net223 by Ivan.Shakhov <Ivan.Shakhov@jetbrains.com>
2 parents 75e8eb4 + 3060834 commit c0eadd8

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

resharper/resharper-unity/src/Unity/InputActions/Psi/Caches/InputActionsCache.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ private InputActionsDeclaredElement CreateDeclaredElements(IPsiSourceFile source
122122
public IEnumerable<InputActionsDeclaredElement> GetDeclaredElements(VirtualFileSystemPath file, string name)
123123
{
124124
myShellLocks.AssertReadAccessAllowed();
125-
var list = myDeclaredElements.Single(a => a.Key.GetLocation() == file).Value;
125+
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
126126
return list.Where(element => element.ShortName == name);
127127
}
128128

rider/src/main/resources/messages/UnityPluginActionsBundle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ action.UnityToolbarLabel.text=Unity:
5656
action.com.jetbrains.rider.plugins.unity.actions.ShowFileInUnityAction.text=Show in Unity
5757
action.com.jetbrains.rider.plugins.unity.actions.ShowFileInUnityFromExplorerAction.text=Unity
5858

59+
group.UnityToolbarActions.text=Unity Toolbar Actions
60+
group.NewUI_UnityToolbarActions.text=Unity Toolbar Actions Base
61+
5962
configurable.name.unity.engine=Unity Engine
6063

6164
#LogView

0 commit comments

Comments
 (0)