Skip to content

Commit 7c2a777

Browse files
nojafnojaf
committed
Wrong line endings?
1 parent b043740 commit 7c2a777

File tree

8 files changed

+492
-492
lines changed

8 files changed

+492
-492
lines changed

‎ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/PostfixTemplates/NewObjPostfixTemplate.fs‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
1-
namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Features.PostfixTemplates
2-
3-
open JetBrains.ReSharper.Feature.Services.PostfixTemplates
4-
open JetBrains.ReSharper.Feature.Services.PostfixTemplates.Contexts
5-
open JetBrains.ReSharper.Plugins.FSharp.Psi
6-
open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Generate
7-
open JetBrains.ReSharper.Plugins.FSharp.Psi.Services.Util.ObjExprUtil
8-
open JetBrains.ReSharper.Plugins.FSharp.Psi.Tree
9-
open JetBrains.ReSharper.Psi.ExtensionsAPI
10-
open JetBrains.ReSharper.Psi.Transactions
11-
open JetBrains.ReSharper.Resources.Shell
12-
13-
[<PostfixTemplate("with", "Create object expression", "{ new T with }")>]
14-
type NewObjPostfixTemplate() =
15-
inherit FSharpPostfixTemplateBase()
16-
17-
override x.CreateBehavior(info) = NewObjPostfixTemplateBehavior(info) :> _
18-
override x.CreateInfo(context) = NewObjPostfixTemplateInfo(context) :> _
19-
20-
override this.IsApplicable(node) =
21-
let refExpr = node.As<IReferenceExpr>()
22-
isNotNull refExpr &&
23-
24-
let expr = node.As<IFSharpExpression>()
25-
FSharpPostfixTemplates.canBecomeStatement false expr &&
26-
27-
NewObjPostfixTemplate.isApplicableExpr refExpr.Qualifier
28-
29-
override this.IsEnabled _ = true
30-
31-
and NewObjPostfixTemplateInfo(expressionContext: PostfixExpressionContext) =
32-
inherit PostfixTemplateInfo("with", expressionContext)
33-
34-
and NewObjPostfixTemplateBehavior(info) =
35-
inherit FSharpPostfixTemplateBehaviorBase(info)
36-
37-
override this.ExpandPostfix(context) =
38-
let node = context.Expression
39-
let psiModule = node.GetPsiModule()
40-
41-
psiModule.GetPsiServices().Transactions.Execute(this.ExpandCommandName, fun _ ->
42-
let factory = node.CreateElementFactory()
43-
44-
use writeCookie = WriteLockCookie.Create(node.IsPhysical())
45-
use disableFormatter = new DisableCodeFormatter()
46-
47-
let expr = this.GetExpression(context)
48-
GenerateOverrides.convertToObjectExpression factory psiModule expr
49-
)
50-
51-
override this.AfterComplete(textControl, node, _) =
52-
let objExpr = node :?> IObjExpr
53-
GenerateOverrides.selectObjExprMemberOrCallCompletion objExpr textControl
1+
namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Features.PostfixTemplates
2+
3+
open JetBrains.ReSharper.Feature.Services.PostfixTemplates
4+
open JetBrains.ReSharper.Feature.Services.PostfixTemplates.Contexts
5+
open JetBrains.ReSharper.Plugins.FSharp.Psi
6+
open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Generate
7+
open JetBrains.ReSharper.Plugins.FSharp.Psi.Services.Util.ObjExprUtil
8+
open JetBrains.ReSharper.Plugins.FSharp.Psi.Tree
9+
open JetBrains.ReSharper.Psi.ExtensionsAPI
10+
open JetBrains.ReSharper.Psi.Transactions
11+
open JetBrains.ReSharper.Resources.Shell
12+
13+
[<PostfixTemplate("with", "Create object expression", "{ new T with }")>]
14+
type NewObjPostfixTemplate() =
15+
inherit FSharpPostfixTemplateBase()
16+
17+
override x.CreateBehavior(info) = NewObjPostfixTemplateBehavior(info) :> _
18+
override x.CreateInfo(context) = NewObjPostfixTemplateInfo(context) :> _
19+
20+
override this.IsApplicable(node) =
21+
let refExpr = node.As<IReferenceExpr>()
22+
isNotNull refExpr &&
23+
24+
let expr = node.As<IFSharpExpression>()
25+
FSharpPostfixTemplates.canBecomeStatement false expr &&
26+
27+
NewObjPostfixTemplate.isApplicableExpr refExpr.Qualifier
28+
29+
override this.IsEnabled _ = true
30+
31+
and NewObjPostfixTemplateInfo(expressionContext: PostfixExpressionContext) =
32+
inherit PostfixTemplateInfo("with", expressionContext)
33+
34+
and NewObjPostfixTemplateBehavior(info) =
35+
inherit FSharpPostfixTemplateBehaviorBase(info)
36+
37+
override this.ExpandPostfix(context) =
38+
let node = context.Expression
39+
let psiModule = node.GetPsiModule()
40+
41+
psiModule.GetPsiServices().Transactions.Execute(this.ExpandCommandName, fun _ ->
42+
let factory = node.CreateElementFactory()
43+
44+
use writeCookie = WriteLockCookie.Create(node.IsPhysical())
45+
use disableFormatter = new DisableCodeFormatter()
46+
47+
let expr = this.GetExpression(context)
48+
GenerateOverrides.convertToObjectExpression factory psiModule expr
49+
)
50+
51+
override this.AfterComplete(textControl, node, _) =
52+
let objExpr = node :?> IObjExpr
53+
GenerateOverrides.selectObjExprMemberOrCallCompletion objExpr textControl

‎ReSharper.FSharp/src/FSharp/FSharp.Psi.Features/src/PostfixTemplates/NewRecordPostfixTemplate.fs‎

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,81 @@
1-
namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Features.PostfixTemplates
2-
3-
open JetBrains.ReSharper.Feature.Services.LiveTemplates.Hotspots
4-
open JetBrains.ReSharper.Feature.Services.LiveTemplates.LiveTemplates
5-
open JetBrains.ReSharper.Feature.Services.LiveTemplates.Templates
6-
open JetBrains.ReSharper.Feature.Services.PostfixTemplates
7-
open JetBrains.ReSharper.Feature.Services.PostfixTemplates.Contexts
8-
open JetBrains.ReSharper.Plugins.FSharp.Psi
9-
open JetBrains.ReSharper.Plugins.FSharp.Psi.Impl
10-
open JetBrains.ReSharper.Plugins.FSharp.Psi.Services.Util
11-
open JetBrains.ReSharper.Plugins.FSharp.Psi.Tree
12-
open JetBrains.ReSharper.Psi
13-
open JetBrains.ReSharper.Psi.ExtensionsAPI
14-
open JetBrains.ReSharper.Psi.ExtensionsAPI.Tree
15-
open JetBrains.ReSharper.Psi.Transactions
16-
open JetBrains.ReSharper.Psi.Tree
17-
open JetBrains.ReSharper.Resources.Shell
18-
19-
[<PostfixTemplate("new", "Construct new record instance", "{ Field = expr }")>]
20-
type NewRecordPostfixTemplate() =
21-
inherit FSharpPostfixTemplateBase()
22-
23-
override x.CreateBehavior(info) = NewRecordPostfixTemplateBehavior(info) :> _
24-
override x.CreateInfo(context) = NewRecordPostfixTemplateInfo(context) :> _
25-
26-
override this.IsApplicable(node) =
27-
let refExpr = node.As<IReferenceExpr>()
28-
isNotNull refExpr &&
29-
30-
let expr = node.As<IFSharpExpression>()
31-
FSharpPostfixTemplates.canBecomeStatement false expr &&
32-
33-
match refExpr.Qualifier with
34-
| :? IReferenceExpr as refExpr ->
35-
let typeElement = refExpr.Reference.Resolve().DeclaredElement.As<ITypeElement>()
36-
typeElement.IsRecord()
37-
| _ -> false
38-
39-
override this.IsEnabled _ = true
40-
41-
42-
and NewRecordPostfixTemplateInfo(expressionContext: PostfixExpressionContext) =
43-
inherit PostfixTemplateInfo("new", expressionContext)
44-
45-
and NewRecordPostfixTemplateBehavior(info) =
46-
inherit FSharpPostfixTemplateBehaviorBase(info)
47-
48-
override this.ExpandPostfix(context) =
49-
let node = context.Expression
50-
let psiServices = node.GetPsiServices()
51-
52-
psiServices.Transactions.Execute(this.ExpandCommandName, fun _ ->
53-
let factory = node.CreateElementFactory()
54-
use writeCookie = WriteLockCookie.Create(node.IsPhysical())
55-
use disableFormatter = new DisableCodeFormatter()
56-
let refExpr = this.GetExpression(context) :?> IReferenceExpr
57-
let typeElement = refExpr.Reference.Resolve().DeclaredElement.As<ITypeElement>()
58-
59-
let recordExpr = factory.CreateExpr("{ }") :?> IRecordExpr
60-
61-
let recordExpr = ModificationUtil.ReplaceChild(refExpr, recordExpr)
62-
RecordExprUtil.generateBindings typeElement recordExpr |> ignore
63-
recordExpr
64-
)
65-
66-
override this.AfterComplete(textControl, node, _) =
67-
let recordExpr = node :?> IRecordExpr
68-
let endOffset = recordExpr.RightBrace.GetDocumentEndOffset()
69-
70-
let hotspotInfos =
71-
recordExpr.FieldBindings.ToArray()
72-
|> Array.map (fun binding ->
73-
let templateField = TemplateField(binding.ReferenceName.ShortName, SimpleHotspotExpression(null), 0)
74-
HotspotInfo(templateField, binding.Expression.GetDocumentRange(), KeepExistingText = true))
75-
76-
let hotspotSession =
77-
LiveTemplatesManager.Instance.CreateHotspotSessionAtopExistingText(
78-
node.GetSolution(), endOffset, textControl,
79-
LiveTemplatesManager.EscapeAction.LeaveTextAndCaret, hotspotInfos)
80-
81-
hotspotSession.ExecuteAndForget()
1+
namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Features.PostfixTemplates
2+
3+
open JetBrains.ReSharper.Feature.Services.LiveTemplates.Hotspots
4+
open JetBrains.ReSharper.Feature.Services.LiveTemplates.LiveTemplates
5+
open JetBrains.ReSharper.Feature.Services.LiveTemplates.Templates
6+
open JetBrains.ReSharper.Feature.Services.PostfixTemplates
7+
open JetBrains.ReSharper.Feature.Services.PostfixTemplates.Contexts
8+
open JetBrains.ReSharper.Plugins.FSharp.Psi
9+
open JetBrains.ReSharper.Plugins.FSharp.Psi.Impl
10+
open JetBrains.ReSharper.Plugins.FSharp.Psi.Services.Util
11+
open JetBrains.ReSharper.Plugins.FSharp.Psi.Tree
12+
open JetBrains.ReSharper.Psi
13+
open JetBrains.ReSharper.Psi.ExtensionsAPI
14+
open JetBrains.ReSharper.Psi.ExtensionsAPI.Tree
15+
open JetBrains.ReSharper.Psi.Transactions
16+
open JetBrains.ReSharper.Psi.Tree
17+
open JetBrains.ReSharper.Resources.Shell
18+
19+
[<PostfixTemplate("new", "Construct new record instance", "{ Field = expr }")>]
20+
type NewRecordPostfixTemplate() =
21+
inherit FSharpPostfixTemplateBase()
22+
23+
override x.CreateBehavior(info) = NewRecordPostfixTemplateBehavior(info) :> _
24+
override x.CreateInfo(context) = NewRecordPostfixTemplateInfo(context) :> _
25+
26+
override this.IsApplicable(node) =
27+
let refExpr = node.As<IReferenceExpr>()
28+
isNotNull refExpr &&
29+
30+
let expr = node.As<IFSharpExpression>()
31+
FSharpPostfixTemplates.canBecomeStatement false expr &&
32+
33+
match refExpr.Qualifier with
34+
| :? IReferenceExpr as refExpr ->
35+
let typeElement = refExpr.Reference.Resolve().DeclaredElement.As<ITypeElement>()
36+
typeElement.IsRecord()
37+
| _ -> false
38+
39+
override this.IsEnabled _ = true
40+
41+
42+
and NewRecordPostfixTemplateInfo(expressionContext: PostfixExpressionContext) =
43+
inherit PostfixTemplateInfo("new", expressionContext)
44+
45+
and NewRecordPostfixTemplateBehavior(info) =
46+
inherit FSharpPostfixTemplateBehaviorBase(info)
47+
48+
override this.ExpandPostfix(context) =
49+
let node = context.Expression
50+
let psiServices = node.GetPsiServices()
51+
52+
psiServices.Transactions.Execute(this.ExpandCommandName, fun _ ->
53+
let factory = node.CreateElementFactory()
54+
use writeCookie = WriteLockCookie.Create(node.IsPhysical())
55+
use disableFormatter = new DisableCodeFormatter()
56+
let refExpr = this.GetExpression(context) :?> IReferenceExpr
57+
let typeElement = refExpr.Reference.Resolve().DeclaredElement.As<ITypeElement>()
58+
59+
let recordExpr = factory.CreateExpr("{ }") :?> IRecordExpr
60+
61+
let recordExpr = ModificationUtil.ReplaceChild(refExpr, recordExpr)
62+
RecordExprUtil.generateBindings typeElement recordExpr |> ignore
63+
recordExpr
64+
)
65+
66+
override this.AfterComplete(textControl, node, _) =
67+
let recordExpr = node :?> IRecordExpr
68+
let endOffset = recordExpr.RightBrace.GetDocumentEndOffset()
69+
70+
let hotspotInfos =
71+
recordExpr.FieldBindings.ToArray()
72+
|> Array.map (fun binding ->
73+
let templateField = TemplateField(binding.ReferenceName.ShortName, SimpleHotspotExpression(null), 0)
74+
HotspotInfo(templateField, binding.Expression.GetDocumentRange(), KeepExistingText = true))
75+
76+
let hotspotSession =
77+
LiveTemplatesManager.Instance.CreateHotspotSessionAtopExistingText(
78+
node.GetSolution(), endOffset, textControl,
79+
LiveTemplatesManager.EscapeAction.LeaveTextAndCaret, hotspotInfos)
80+
81+
hotspotSession.ExecuteAndForget()

‎ReSharper.FSharp/src/FSharp/FSharp.Psi.Intentions/src/Intentions/FSharpContextActions.fs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Intentions
2-
3-
open JetBrains.ReSharper.Feature.Services.ContextActions
4-
5-
[<ContextActionGroup(Id = "F#", Name = "F#")>]
6-
[<AbstractClass; Sealed>]
7-
type FSharpContextActions private () =
8-
class
9-
end
1+
namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Intentions
2+
3+
open JetBrains.ReSharper.Feature.Services.ContextActions
4+
5+
[<ContextActionGroup(Id = "F#", Name = "F#")>]
6+
[<AbstractClass; Sealed>]
7+
type FSharpContextActions private () =
8+
class
9+
end

‎ReSharper.FSharp/src/FSharp/FSharp.Psi.Intentions/src/QuickFixes/ToObjectExpressionFix.fs‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon.QuickFixes
2-
3-
open JetBrains.ReSharper.Plugins.FSharp.Psi
4-
open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon.Highlightings
5-
open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon.QuickFixes
6-
open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Generate
7-
open JetBrains.ReSharper.Plugins.FSharp.Psi.Services.Util.ObjExprUtil
8-
open JetBrains.ReSharper.Plugins.FSharp.Psi.Tree
9-
open JetBrains.ReSharper.Psi.ExtensionsAPI
10-
open JetBrains.ReSharper.Resources.Shell
11-
12-
type ToObjectExpressionFix(error: AbstractTypeCannotBeInstantiatedError) =
13-
inherit FSharpQuickFixBase()
14-
15-
let expr = error.Expr
16-
17-
override this.Text = "Convert to object expression"
18-
19-
override this.IsAvailable(cache) =
20-
let appExpr = expr.As<IPrefixAppExpr>()
21-
isNotNull appExpr &&
22-
23-
let refExpr = appExpr.FunctionExpression.As<IReferenceExpr>()
24-
isNotNull refExpr &&
25-
26-
NewObjPostfixTemplate.isApplicableExpr refExpr
27-
28-
override this.ExecutePsiTransaction(solution, var0) =
29-
let factory = expr.CreateElementFactory()
30-
31-
use writeCookie = WriteLockCookie.Create(expr.IsPhysical())
32-
use disableFormatter = new DisableCodeFormatter()
33-
34-
let psiModule = expr.GetPsiModule()
35-
let objExpr = GenerateOverrides.convertToObjectExpression factory psiModule expr
36-
GenerateOverrides.selectObjExprMemberOrCallCompletion objExpr
1+
namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon.QuickFixes
2+
3+
open JetBrains.ReSharper.Plugins.FSharp.Psi
4+
open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon.Highlightings
5+
open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon.QuickFixes
6+
open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Generate
7+
open JetBrains.ReSharper.Plugins.FSharp.Psi.Services.Util.ObjExprUtil
8+
open JetBrains.ReSharper.Plugins.FSharp.Psi.Tree
9+
open JetBrains.ReSharper.Psi.ExtensionsAPI
10+
open JetBrains.ReSharper.Resources.Shell
11+
12+
type ToObjectExpressionFix(error: AbstractTypeCannotBeInstantiatedError) =
13+
inherit FSharpQuickFixBase()
14+
15+
let expr = error.Expr
16+
17+
override this.Text = "Convert to object expression"
18+
19+
override this.IsAvailable(cache) =
20+
let appExpr = expr.As<IPrefixAppExpr>()
21+
isNotNull appExpr &&
22+
23+
let refExpr = appExpr.FunctionExpression.As<IReferenceExpr>()
24+
isNotNull refExpr &&
25+
26+
NewObjPostfixTemplate.isApplicableExpr refExpr
27+
28+
override this.ExecutePsiTransaction(solution, var0) =
29+
let factory = expr.CreateElementFactory()
30+
31+
use writeCookie = WriteLockCookie.Create(expr.IsPhysical())
32+
use disableFormatter = new DisableCodeFormatter()
33+
34+
let psiModule = expr.GetPsiModule()
35+
let objExpr = GenerateOverrides.convertToObjectExpression factory psiModule expr
36+
GenerateOverrides.selectObjExprMemberOrCallCompletion objExpr

0 commit comments

Comments
 (0)