Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync with the ultimate master #775

Merged
merged 4 commits into from
Dec 9, 2024
Merged

Sync with the ultimate master #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f500b2
[dotnet] apply DeadlockSafetyAttributesUpdateAction
Dec 7, 2024
1e7933a
[dotnet] mark IInjectionNodeProvider as DeadlockSafe
Dec 8, 2024
80e41fa
[dotnet] mark IInjectedPsiProvider as DeadlockSafe
Dec 8, 2024
59d6724
[dotnet] apply DeadlockSafetyAttributesUpdateAction
Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ReSharper.FSharp/src/FSharp/FSharp.Common/src/Shim/FileSystem/AssemblyInfoShim.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ open JetBrains.ProjectModel
open JetBrains.ReSharper.Plugins.FSharp
open JetBrains.Util

[<SolutionComponent(Instantiation.DemandAnyThreadUnsafe)>]
[<SolutionComponent(Instantiation.DemandAnyThreadSafe)>]
type AssemblyInfoShim(lifetime: Lifetime, fsSourceCache: FSharpSourceCache,
assemblyExistsService: AssemblyExistsService, toolset: ISolutionToolset) =
inherit DelegatingFileSystemShim(lifetime)
Expand Down
2 changes: 1 addition & 1 deletion ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/Injected/FSharpLiteralInjectionTarget.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ open JetBrains.ReSharper.Psi.Tree
open JetBrains.ReSharper.Psi.Impl.Shared.InjectedPsi
open JetBrains.Text

[<SolutionComponent(InstantiationEx.LegacyDefault)>]
[<SolutionComponent(Instantiation.DemandAnyThreadSafe)>]
type FSharpLiteralInjectionTarget() =
let isInjectionAllowed tokenType =
FSharpTokenType.Strings[tokenType] &&
Expand Down
2 changes: 1 addition & 1 deletion ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/Injected/FSharpRegexNodeProvider.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Util.FSharpMethodInvocation
open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Util.FSharpExpressionUtil
open JetBrains.ReSharper.Plugins.FSharp.Util

[<SolutionComponent(InstantiationEx.LegacyDefault)>]
[<SolutionComponent(Instantiation.DemandAnyThreadSafe)>]
type FSharpRegexNodeProvider() =
let rec evalOptionsArg (expr: IFSharpExpression) =
match expr.IgnoreInnerParens() with
Expand Down
4 changes: 2 additions & 2 deletions ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/Injected/FSharpRegexProviders.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ open JetBrains.ReSharper.Psi.RegExp.Resources
open JetBrains.ReSharper.Psi.Tree
open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.StringLiteralsUtil

[<SolutionComponent(InstantiationEx.LegacyDefault)>]
[<SolutionComponent(Instantiation.DemandAnyThreadSafe)>]
type FSharpRegexInjectionProvider
(lifetime: Lifetime, solution: ISolution, persistentIndexManager: IPersistentIndexManager,
providersViewer: InjectionNodeProvidersViewer, injectionTargetLanguage: FSharpLiteralInjectionTarget) =
Expand All @@ -32,7 +32,7 @@ type FSharpRegexInjectionProvider
override _.SupportsInjectionIntention = false


[<SolutionComponent(InstantiationEx.LegacyDefault)>]
[<SolutionComponent(Instantiation.DemandAnyThreadSafe)>]
type RegExprPsiProvider(injectorProvider: FSharpRegexInjectionProvider) =
inherit LiteralsInjectionPsiProvider<FSharpLanguage, ClrRegexLanguage>(injectorProvider, ClrRegexLanguage.Instance)

Expand Down
2 changes: 1 addition & 1 deletion ReSharper.FSharp/src/FSharp/FSharp.Psi/src/Metadata/FSharpAutoOpenCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Metadata
{
[PsiComponent(Instantiation.DemandAnyThreadUnsafe)]
[PsiComponent(Instantiation.DemandAnyThreadSafe)]
public class FSharpAutoOpenCache : IAssemblyCache
{
private readonly IPsiAssemblyFileLoader myPsiAssemblyFileLoader;
Expand Down
Loading