From 2e35cfc3ba65c6d1584154e90a2dd96042ceeac1 Mon Sep 17 00:00:00 2001 From: Gareth Parker Date: Sun, 18 Oct 2026 19:37:08 +0100 Subject: [PATCH 1/3] Update to support Rider 2026.3 --- .idea/icon.png | Bin 0 -> 20686 bytes Directory.Build.props | 2 +- .../ReSharperPlugin.RimworldDev.Tests.csproj | 7 ++++--- .../Rimworld/TestBooleanPropertyValue.xml.gold | 3 ++- .../Rimworld/TestDefName.xml.gold | 3 ++- .../Rimworld/TestDefReferenceOtherFile.xml.gold | 3 ++- .../Rimworld/TestDefReferenceSameFile.xml.gold | 3 ++- .../Rimworld/TestDefsFilterByType.xml.gold | 3 ++- .../Rimworld/TestEnumValue.xml.gold | 3 ++- .../Rimworld/TestListItemProperties.xml.gold | 3 ++- .../TestListItemWithClassProperties.xml.gold | 3 ++- .../TestModDefAsSuperclassReference.xml.gold | 3 ++- .../Rimworld/TestModDefClassProperties.xml.gold | 3 ++- .../TestModListItemClassProperties.xml.gold | 3 ++- .../Rimworld/TestNestedFieldProperties.xml.gold | 3 ++- .../Rimworld/TestParentName.xml.gold | 3 ++- .../Rimworld/TestStructPropertyValue.xml.gold | 3 ++- .../Rimworld/TestThingDefProperties.xml.gold | 3 ++- .../TestDefDatabaseGetNamed.cs.gold | 3 ++- .../TestDefOfFieldWithPrefix.cs.gold | 3 ++- ...TestDefOfFieldWithPrefixAndSemicolon.cs.gold | 3 ++- .../SmokeTests/CSharp/TestLocalVariable.cs.gold | 5 ++++- .../RimworlXMLCompletionContextProvider.cs | 2 +- .../RimworldCSharpLookupFactory.cs | 12 ++++-------- 24 files changed, 50 insertions(+), 32 deletions(-) create mode 100644 .idea/icon.png diff --git a/.idea/icon.png b/.idea/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..73bb74f4cd466700fd27c1c8592ccd9ce4a9d328 GIT binary patch literal 20686 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%0A)toZ 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 D+nG0~ literal 0 HcmV?d00001 diff --git a/Directory.Build.props b/Directory.Build.props index 16c38d5..8eed2a5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,7 +4,7 @@ - 2026.1.5.2 + 2026.3.0-eap07 Rimworld Development Environment Bring the intelligence of your IDE to Rimworld XML files. Use information backed by Rimworlds DLL file to autocomplete your XML, Ctrl+Click into the C# that your XML gets translated into and see what options you have when adding items in your mods! diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/ReSharperPlugin.RimworldDev.Tests.csproj b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/ReSharperPlugin.RimworldDev.Tests.csproj index a01143c..194c4b3 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/ReSharperPlugin.RimworldDev.Tests.csproj +++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/ReSharperPlugin.RimworldDev.Tests.csproj @@ -75,15 +75,16 @@ + once anything makes it scan our plugin assembly. Use the netstandard2.0 builds: from 2026.3 the Rider.Backend + package also ships DotFiles/NetCore/netstandard2.0/JetBrains.Lifetimes.dll into the output, and the shell's + assembly binder refuses to start if the root copy is a different build (e.g. net472) with a different MVID. --> <_JetPinnedLib Include="@(RuntimeCopyLocalItems)" Condition="'%(RuntimeCopyLocalItems.Extension)' == '.dll' And ('%(RuntimeCopyLocalItems.NuGetPackageId)' == 'JetBrains.Lifetimes' Or '%(RuntimeCopyLocalItems.NuGetPackageId)' == 'JetBrains.RdFramework')" /> - <_JetNetFxLib Include="@(_JetPinnedLib->'%(RootDir)%(Directory)..\net472\%(Filename)%(Extension)')" /> + <_JetNetFxLib Include="@(_JetPinnedLib->'%(RootDir)%(Directory)..\netstandard2.0\%(Filename)%(Extension)')" /> diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestBooleanPropertyValue.xml.gold b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestBooleanPropertyValue.xml.gold index 62a7967..a9156ac 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestBooleanPropertyValue.xml.gold +++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestBooleanPropertyValue.xml.gold @@ -1,11 +1,12 @@ Completion: Basic Count: 2 Focus: Hard +Rules: [\w] => add_to_prefix Range: "♦" ##### RELEVANCE SORT ##### - [FromSingleCompletion, FromLightAndDynamicEvaluation, NormalSelectionPriority, Other] + [FromLightEvaluation, NormalSelectionPriority, Other] false <== true diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestDefName.xml.gold b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestDefName.xml.gold index 3bffd35..7107f2a 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestDefName.xml.gold +++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestDefName.xml.gold @@ -2,12 +2,13 @@ Prefix: "Thou" Count: 1 Focus: Hard +Rules: [\w] => add_to_prefix Range: " add_to_prefix Range: "♦" ##### RELEVANCE SORT ##### - [FromSingleCompletion, FromLightAndDynamicEvaluation, NormalSelectionPriority, Other] + [FromLightEvaluation, NormalSelectionPriority, Other] OtherThing <== TestThingB diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestDefReferenceSameFile.xml.gold b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestDefReferenceSameFile.xml.gold index 03ebb55..ddb364b 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestDefReferenceSameFile.xml.gold +++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestDefReferenceSameFile.xml.gold @@ -1,11 +1,12 @@ Completion: Basic Count: 2 Focus: Hard +Rules: [\w] => add_to_prefix Range: "♦" ##### RELEVANCE SORT ##### - [FromSingleCompletion, FromLightAndDynamicEvaluation, NormalSelectionPriority, Other] + [FromLightEvaluation, NormalSelectionPriority, Other] TestThingA <== TestThingB diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestDefsFilterByType.xml.gold b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestDefsFilterByType.xml.gold index 315b4b2..5ae17c8 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestDefsFilterByType.xml.gold +++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestDefsFilterByType.xml.gold @@ -1,11 +1,12 @@ Completion: Basic Count: 2 Focus: Hard +Rules: [\w] => add_to_prefix Range: "
  • ♦" ##### RELEVANCE SORT ##### - [FromSingleCompletion, FromLightAndDynamicEvaluation, NormalSelectionPriority, Other] + [FromLightEvaluation, NormalSelectionPriority, Other] Metallic <== Woody diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestEnumValue.xml.gold b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestEnumValue.xml.gold index f4bb505..451c372 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestEnumValue.xml.gold +++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestEnumValue.xml.gold @@ -1,11 +1,12 @@ Completion: Basic Count: 12 Focus: Hard +Rules: [\w] => add_to_prefix Range: "♦" ##### RELEVANCE SORT ##### - [FromSingleCompletion, FromLightAndDynamicEvaluation, NormalSelectionPriority, Other] + [FromLightEvaluation, NormalSelectionPriority, Other] Attachment 8 <== Building 3 Ethereal 10 diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestListItemProperties.xml.gold b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestListItemProperties.xml.gold index 37ad97c..fd835eb 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestListItemProperties.xml.gold +++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestListItemProperties.xml.gold @@ -1,11 +1,12 @@ Completion: Basic Count: 1 Focus: Hard +Rules: [\w] => add_to_prefix Range: "<♦" ##### RELEVANCE SORT ##### - [FromSingleCompletion, FromLightAndDynamicEvaluation, NormalSelectionPriority, Other] + [FromLightEvaluation, NormalSelectionPriority, Other] compClass Type <== ##### ALPHABETIC SORT ##### diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestListItemWithClassProperties.xml.gold b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestListItemWithClassProperties.xml.gold index 6e59e3d..28aab8b 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestListItemWithClassProperties.xml.gold +++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestListItemWithClassProperties.xml.gold @@ -2,12 +2,13 @@ Prefix: "always" Count: 1 Focus: Hard +Rules: [\w] => add_to_prefix Range: " add_to_prefix Range: "♦" ##### RELEVANCE SORT ##### - [FromSingleCompletion, FromLightAndDynamicEvaluation, NormalSelectionPriority, Other] + [FromLightEvaluation, NormalSelectionPriority, Other] CustomThing <== TestThing diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestModDefClassProperties.xml.gold b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestModDefClassProperties.xml.gold index 3a865f6..2d952f4 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestModDefClassProperties.xml.gold +++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestModDefClassProperties.xml.gold @@ -2,6 +2,7 @@ Prefix: "cus" Count: 3 Focus: Hard +Rules: [\w] => add_to_prefix Range: " add_to_prefix Range: "<♦" ##### RELEVANCE SORT ##### - [FromSingleCompletion, FromLightAndDynamicEvaluation, NormalSelectionPriority, Other] + [FromLightEvaluation, NormalSelectionPriority, Other] compClass Type <== customValue float diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestNestedFieldProperties.xml.gold b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestNestedFieldProperties.xml.gold index ff4469c..623038e 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestNestedFieldProperties.xml.gold +++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestNestedFieldProperties.xml.gold @@ -1,11 +1,12 @@ Completion: Basic Count: 34 Focus: Hard +Rules: [\w] => add_to_prefix Range: "<♦" ##### RELEVANCE SORT ##### - [FromSingleCompletion, FromLightAndDynamicEvaluation, NormalSelectionPriority, Other] + [FromLightEvaluation, NormalSelectionPriority, Other] addTopAltitudeBias bool <== allowAtlasing bool allowFlip bool diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestParentName.xml.gold b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestParentName.xml.gold index f44d911..a494707 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestParentName.xml.gold +++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestParentName.xml.gold @@ -1,11 +1,12 @@ Completion: Basic Count: 1 Focus: Hard +Rules: [\w] => add_to_prefix Range: "" ##### RELEVANCE SORT ##### - [FromSingleCompletion, FromLightAndDynamicEvaluation, NormalSelectionPriority, Other] + [FromLightEvaluation, NormalSelectionPriority, Other] AbstractBase <== ##### ALPHABETIC SORT ##### diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestStructPropertyValue.xml.gold b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestStructPropertyValue.xml.gold index 96458cb..83b25b4 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestStructPropertyValue.xml.gold +++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestStructPropertyValue.xml.gold @@ -1,11 +1,12 @@ Completion: Basic Count: 5 Focus: Hard +Rules: [\w] => add_to_prefix Range: "♦" ##### RELEVANCE SORT ##### - [FromSingleCompletion, FromLightAndDynamicEvaluation, NormalSelectionPriority, Other] + [FromLightEvaluation, NormalSelectionPriority, Other] East Rot4 <== Invalid Rot4 North Rot4 diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestThingDefProperties.xml.gold b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestThingDefProperties.xml.gold index f0d90ab..a91f5c6 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestThingDefProperties.xml.gold +++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/Rimworld/TestThingDefProperties.xml.gold @@ -2,6 +2,7 @@ Prefix: "altit" Count: 2 Focus: Hard +Rules: [\w] => add_to_prefix Range: " ##### ALPHABETIC SORT ##### diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/RimworldCSharp/TestDefDatabaseGetNamed.cs.gold b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/RimworldCSharp/TestDefDatabaseGetNamed.cs.gold index 9cec850..612bf53 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/RimworldCSharp/TestDefDatabaseGetNamed.cs.gold +++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/RimworldCSharp/TestDefDatabaseGetNamed.cs.gold @@ -1,11 +1,12 @@ Completion: Basic Count: 2 Focus: Hard +Rules: [\w] => add_to_prefix Range: "public static ThingDef Get() => DefDatabase.GetNamed("♦");" ##### RELEVANCE SORT ##### - [FromSingleCompletion, FromLightAndDynamicEvaluation, NotObsolete, ObsoleteRuleApplied, NormalSelectionPriority, Other] + [FromLightEvaluation, NotObsolete, ObsoleteRuleApplied, NormalSelectionPriority, Other] ModThingA <== ModThingB diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/RimworldCSharp/TestDefOfFieldWithPrefix.cs.gold b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/RimworldCSharp/TestDefOfFieldWithPrefix.cs.gold index f9f38c5..38f80d4 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/RimworldCSharp/TestDefOfFieldWithPrefix.cs.gold +++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/RimworldCSharp/TestDefOfFieldWithPrefix.cs.gold @@ -2,12 +2,13 @@ Prefix: "Mod" Count: 4 Focus: Hard +Rules: [\w] => add_to_prefix Range: "public static ThingDef Mod♦" ▲▲▲▲ ##### RELEVANCE SORT ##### - [FromSingleCompletion, FromLightAndDynamicEvaluation, PrefixMatch, NotObsolete, ObsoleteRuleApplied, NormalSelectionPriority, Other] + [FromLightEvaluation, PrefixMatch, NotObsolete, ObsoleteRuleApplied, NormalSelectionPriority, Other] ṂọḍDef <== ṂọḍThingA ṂọḍThingB diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/RimworldCSharp/TestDefOfFieldWithPrefixAndSemicolon.cs.gold b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/RimworldCSharp/TestDefOfFieldWithPrefixAndSemicolon.cs.gold index 7aacee7..664e17f 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/RimworldCSharp/TestDefOfFieldWithPrefixAndSemicolon.cs.gold +++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/CompletionSuggestions/RimworldCSharp/TestDefOfFieldWithPrefixAndSemicolon.cs.gold @@ -2,12 +2,13 @@ Prefix: "Mod" Count: 4 Focus: Hard +Rules: [\w] => add_to_prefix Range: "public static ThingDef Mod♦;" ▲▲▲▲ ##### RELEVANCE SORT ##### - [FromSingleCompletion, FromLightAndDynamicEvaluation, PrefixMatch, NotObsolete, ObsoleteRuleApplied, NormalSelectionPriority, Other] + [FromLightEvaluation, PrefixMatch, NotObsolete, ObsoleteRuleApplied, NormalSelectionPriority, Other] ṂọḍDef <== ṂọḍThingA ṂọḍThingB diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/SmokeTests/CSharp/TestLocalVariable.cs.gold b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/SmokeTests/CSharp/TestLocalVariable.cs.gold index fe33494..b97934b 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/SmokeTests/CSharp/TestLocalVariable.cs.gold +++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/SmokeTests/CSharp/TestLocalVariable.cs.gold @@ -2,12 +2,15 @@ Prefix: "myLoc" Count: 1 Focus: Hard +Rules: [ =] & prefix="_" => hide_lookup + ["$] & prefix="@" => hide_lookup + [\w] => add_to_prefix Range: "myLoc♦" ▲▲▲▲▲▲ ##### RELEVANCE SORT ##### - [FromSingleCompletion, FromLightAndDynamicEvaluation, PrefixMatch, LocalVariablesAndParameters, NotObsolete, ObsoleteRuleApplied, NormalSelectionPriority, ClosestLocalVar, Other] + [FromLightEvaluation, PrefixMatch, LocalVariablesAndParameters, NotObsolete, ObsoleteRuleApplied, NormalSelectionPriority, ClosestLocalVar, Other] ṃỵḶọc̣alVariable int <== ##### ALPHABETIC SORT ##### diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/RimworlXMLCompletionContextProvider.cs b/src/dotnet/ReSharperPlugin.RimworldDev/RimworlXMLCompletionContextProvider.cs index 56e69cc..1888997 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev/RimworlXMLCompletionContextProvider.cs +++ b/src/dotnet/ReSharperPlugin.RimworldDev/RimworlXMLCompletionContextProvider.cs @@ -72,7 +72,7 @@ public override ISpecificCodeCompletionContext GetCompletionContext(CodeCompleti TextLookupRanges textLookupRanges = CodeCompletionContextProviderBase.GetTextLookupRanges(context, documentRange); return new RimworldXmlCodeCompletionContext(context, xmlFile, - xmlFile.FindNodeAt(unterminatedContext.Range), textLookupRanges); + xmlFile.FindNodeAt(context.SelectedTreeRange), textLookupRanges); } } } \ No newline at end of file diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/RimworldCSharpLookupFactory.cs b/src/dotnet/ReSharperPlugin.RimworldDev/RimworldCSharpLookupFactory.cs index 6c412af..5a341ec 100644 --- a/src/dotnet/ReSharperPlugin.RimworldDev/RimworldCSharpLookupFactory.cs +++ b/src/dotnet/ReSharperPlugin.RimworldDev/RimworldCSharpLookupFactory.cs @@ -7,8 +7,8 @@ using JetBrains.ReSharper.Feature.Services.CodeCompletion.Infrastructure; using JetBrains.ReSharper.Feature.Services.CodeCompletion.Infrastructure.AspectLookupItems.BaseInfrastructure; using JetBrains.ReSharper.Feature.Services.CodeCompletion.Infrastructure.AspectLookupItems.Info; -using JetBrains.ReSharper.Feature.Services.CodeCompletion.Infrastructure.AspectLookupItems.Matchers; using JetBrains.ReSharper.Feature.Services.CodeCompletion.Infrastructure.AspectLookupItems.Presentations; +using JetBrains.ReSharper.Feature.Services.CodeCompletion.Infrastructure.Match; using JetBrains.ReSharper.Feature.Services.CSharp.CodeCompletion.Infrastructure; using JetBrains.ReSharper.Features.Intellisense.CodeCompletion.CSharp; using JetBrains.ReSharper.Features.Intellisense.CodeCompletion.CSharp.AspectLookupItems; @@ -27,9 +27,8 @@ namespace ReSharperPlugin.RimworldDev; -// Note, this class is mostly copy-pasted from Jetbrains CSharpLookupFactory class, I just made some minor additions -// so that the autocomplete would display a bit nicer - +// Note, this class is mostly copy-pasted from Jetbrains' CSharpLookupItemFactory (SDK 2021.2), I just made some minor +// additions so that the autocomplete would display a bit nicer public class RimworldCSharpLookupFactory { private readonly Func, ILookupItemPresentation> @@ -63,9 +62,6 @@ private readonly Func, ILookupItemPresenta private readonly Func, ILookupItemBehavior> myFGetDeclaredElementBehavior = item => new CSharpDeclaredElementBehavior(item); - private readonly Func, ILookupItemMatcher> myFGetDeclaredElementMatcher = - item => new DeclaredElementMatcher(item.Info, "@"); - private readonly Func, ILookupItemBehavior> myFGetTypeElementBehavior = item => new CSharpDeclaredElementBehavior(item); @@ -211,7 +207,7 @@ public LookupItem CreateDeclaredElementLookupItem( var dataHolder = LookupItemFactory.CreateLookupItem(declaredElementInfo) .WithPresentation(fGetPresentation) .WithBehavior(myFGetDeclaredElementBehavior) - .WithMatcher(myFGetDeclaredElementMatcher); + .WithMatcher(LookupItemMatcher.CSharpIdentifier); var typeOwner = element as ITypeOwner; if (instance.Element is IAnonymousTypeProperty) From 6594d4956916a766719c905cd589090b6b0a7ce5 Mon Sep 17 00:00:00 2001 From: Gareth Parker Date: Sun, 18 Oct 2026 20:45:07 +0100 Subject: [PATCH 2/3] Add missing lockfile --- ...797d526beac5c21e7ced04cacc4975c989ccb4c610ba0395f0e1b.lock | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/NuGetLocks/558c33f34eb797d526beac5c21e7ced04cacc4975c989ccb4c610ba0395f0e1b.lock diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/NuGetLocks/558c33f34eb797d526beac5c21e7ced04cacc4975c989ccb4c610ba0395f0e1b.lock b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/NuGetLocks/558c33f34eb797d526beac5c21e7ced04cacc4975c989ccb4c610ba0395f0e1b.lock new file mode 100644 index 0000000..caa6e87 --- /dev/null +++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/NuGetLocks/558c33f34eb797d526beac5c21e7ced04cacc4975c989ccb4c610ba0395f0e1b.lock @@ -0,0 +1,4 @@ +# Please commit this file, it's crucial for tests stability. Even if you believe it's not yours, it still needs to be committed. +# Input (NuGetFramework=net35): +# JetBrains.Annotations [2026.2.0] +JetBrains.Annotations 2026.2.0 \ No newline at end of file From 65ac0ebe8c29d4f713619f4b2bee8bafd321173b Mon Sep 17 00:00:00 2001 From: Gareth Parker Date: Sun, 18 Oct 2026 21:38:52 +0100 Subject: [PATCH 3/3] Update the Kotlin side for 2026.3 --- build.gradle.kts | 5 +++++ src/rider/main/kotlin/run/RunConfiguration.kt | 1 - src/rider/main/kotlin/run/RunState.kt | 18 +++++++++--------- .../run/UnityDebugRemoteConfiguration.kt | 15 --------------- 4 files changed, 14 insertions(+), 25 deletions(-) delete mode 100644 src/rider/main/kotlin/run/UnityDebugRemoteConfiguration.kt diff --git a/build.gradle.kts b/build.gradle.kts index aea3e4f..5bbe18b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -166,6 +166,11 @@ dependencies { bundledPlugin("com.intellij.resharper.unity") bundledModule("intellij.spellchecker") + + // Since 2026.3 these are separate product modules rather than part of the core classpath. rdclient.dotnet has + // RiderTypingPolicy/RiderEditorActionPolicy, SimpleOptionsPage and Project.solution; languages has the C# PSI. + bundledModule("intellij.rider.rdclient.dotnet") + bundledModule("intellij.rider.languages") } } diff --git a/src/rider/main/kotlin/run/RunConfiguration.kt b/src/rider/main/kotlin/run/RunConfiguration.kt index 049a355..1c6ab86 100644 --- a/src/rider/main/kotlin/run/RunConfiguration.kt +++ b/src/rider/main/kotlin/run/RunConfiguration.kt @@ -107,7 +107,6 @@ class RunConfiguration(project: Project, factory: ConfigurationFactory, name: St getSaveFilePath(), getModListPath(), getRimworldState(environment), - UnityDebugRemoteConfiguration(), environment, "CustomPlayer" ); diff --git a/src/rider/main/kotlin/run/RunState.kt b/src/rider/main/kotlin/run/RunState.kt index 72ed7bf..b682277 100644 --- a/src/rider/main/kotlin/run/RunState.kt +++ b/src/rider/main/kotlin/run/RunState.kt @@ -2,16 +2,15 @@ package RimworldDev.Rider.run import RimworldDev.Rider.helpers.ScopeHelper import com.intellij.execution.ExecutionResult -import com.intellij.execution.Executor import com.intellij.execution.configurations.RunProfileState import com.intellij.execution.process.* import com.intellij.execution.runners.ExecutionEnvironment -import com.intellij.execution.runners.ProgramRunner +import com.intellij.execution.ui.ConsoleView import com.intellij.util.system.OS import com.jetbrains.rd.util.lifetime.Lifetime import com.jetbrains.rider.debugger.DebuggerWorkerProcessHandler +import com.jetbrains.rider.plugins.unity.run.UnityDebugEngine import com.jetbrains.rider.plugins.unity.run.configurations.UnityAttachProfileState -import com.jetbrains.rider.run.configurations.remote.RemoteConfiguration import com.jetbrains.rider.run.getProcess import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext @@ -25,11 +24,13 @@ class RunState( private val saveFilePath: String, private val modListPath: String, private val rimworldState: RunProfileState, - remoteConfiguration: RemoteConfiguration, executionEnvironment: ExecutionEnvironment, targetName: String ) : - UnityAttachProfileState(remoteConfiguration, executionEnvironment, targetName), RunProfileState { + UnityAttachProfileState(executionEnvironment, targetName, false), RunProfileState { + // Doorstop's debugger agent listens on localhost:56000; we connect to it rather than waiting for the game to dial in + override fun getDebugEngine(): UnityDebugEngine = UnityDebugEngine.Mono("localhost", 56000, false) + private val resources = mapOf( OS.Windows to listOf( ".doorstop_version", @@ -77,8 +78,7 @@ class RunState( ) override suspend fun execute( - executor: Executor, - runner: ProgramRunner<*>, + workerConsole: ConsoleView, workerProcessHandler: DebuggerWorkerProcessHandler, lifetime: Lifetime ): ExecutionResult { @@ -104,10 +104,10 @@ class RunState( } } else { // Windows: rimworldState handles env vars and process lifecycle normally. - rimworldState.execute(executor, runner)?.processHandler?.getProcess() + rimworldState.execute(executionEnvironment.executor, executionEnvironment.runner)?.processHandler?.getProcess() } - val result = super.execute(executor, runner, workerProcessHandler) + val result = super.execute(workerConsole, workerProcessHandler, lifetime) ProcessTerminatedListener.attach(workerProcessHandler.debuggerWorkerRealHandler) workerProcessHandler.debuggerWorkerRealHandler.addProcessListener(object : ProcessAdapter() { override fun processTerminated(event: ProcessEvent) { diff --git a/src/rider/main/kotlin/run/UnityDebugRemoteConfiguration.kt b/src/rider/main/kotlin/run/UnityDebugRemoteConfiguration.kt deleted file mode 100644 index 28aa5b3..0000000 --- a/src/rider/main/kotlin/run/UnityDebugRemoteConfiguration.kt +++ /dev/null @@ -1,15 +0,0 @@ -package RimworldDev.Rider.run - -import com.jetbrains.rider.run.configurations.remote.RemoteConfiguration - -class UnityDebugRemoteConfiguration: RemoteConfiguration { - override var address: String - get() = "localhost" - set(value) {} - override var listenPortForConnections: Boolean - get() = false - set(value) {} - override var port: Int - get() = 56000 - set(value) {} -} \ No newline at end of file