Skip to content

Commit 824deb8

Browse files
Bart KoelmanBart Koelman
authored andcommitted
Revert expected event handler names for AV1738
Because a fix for https://youtrack.jetbrains.com/issue/RSRP-461586 is still not in place, this matches the current Resharper behavior.
1 parent 0ec2022 commit 824deb8

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

docs/Overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ The list below describes per rule what its analyzer reports on. Checked rules ar
102102
- [x] This analyzer reports public and internal boolean parameters and members whose names do not start with words like "Is", "Has", "Can" etc.
103103

104104
### [AV1738](https://github.com/dennisdoomen/CSharpGuidelines/blob/master/Src/Guidelines/1700_NamingGuidelines.md#av1738): Prefix an event handler with On (LOW)
105-
- [x] This analyzer reports when the target method in an event handler assignment does not match the pattern "On" followed by target field name and the name of the event.
105+
- [x] This analyzer reports when the target method in an event handler assignment does not match the pattern: target field name, followed by "On" and the name of the event.
106106

107107
### [AV1739](https://github.com/dennisdoomen/CSharpGuidelines/blob/master/Src/Guidelines/1700_NamingGuidelines.md#av1739): Use an underscore for irrelevant lambda parameters (LOW)
108108
- [x] This analyzer reports unused lambda parameters whose names contain any characters other than underscores.

src/CSharpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer.Test/Specs/Naming/PrefixEventHandlersWithOnSpecs.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,10 @@ public class C
138138
139139
public void M()
140140
{
141-
_topLeft.ValueChanged += OnTopLeftValueChanged;
141+
_topLeft.ValueChanged += TopLeftOnValueChanged;
142142
}
143143
144-
public void OnTopLeftValueChanged(object sender, EventArgs e)
144+
public void TopLeftOnValueChanged(object sender, EventArgs e)
145145
{
146146
}
147147
}
@@ -181,7 +181,7 @@ public void HandleTopLeftValueChanged(object sender, EventArgs e)
181181

182182
// Act and assert
183183
VerifyGuidelineDiagnostic(source,
184-
"Method 'HandleTopLeftValueChanged' that handles event 'ValueChanged' should be renamed to 'OnTopLeftValueChanged'.");
184+
"Method 'HandleTopLeftValueChanged' that handles event 'ValueChanged' should be renamed to 'TopLeftOnValueChanged'.");
185185
}
186186

187187
[Fact]

src/CSharpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer/Rules/Naming/PrefixEventHandlersWithOnAnalyzer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ private static void AnalyzeEventAssignmentMethod([NotNull] IMethodBindingExpress
5454
[NotNull] IEventAssignmentExpression assignment, OperationAnalysisContext context)
5555
{
5656
string eventTargetName = GetEventTargetName(assignment.EventInstance);
57-
string handlerNameExpected = string.Concat("On", eventTargetName, assignment.Event.Name);
57+
string handlerNameExpected = string.Concat(eventTargetName, "On", assignment.Event.Name);
5858

5959
string handlerNameActual = binding.Method.Name;
6060
if (handlerNameActual != handlerNameExpected)

0 commit comments

Comments
 (0)