Skip to content

Commit 7606ad8

Browse files
authored
Merge pull request #10 from neilt6/patch-1
Improved Caliburn Action Detection
2 parents 11bf9e3 + 574f377 commit 7606ad8

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

Confuser.Renamer/Analyzers/CaliburnAnalyzer.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void AnalyzeBAMLElement(BAMLAnalyzer analyzer, BamlElement elem) {
4545
else if (attr.Item1 != null)
4646
attrName = attr.Item1.Name;
4747

48-
if (attrName == "Attach")
48+
if (attrName == "Attach" || (attrName == "Value" && prop.Value.Contains("Action")))
4949
AnalyzeMessageAttach(analyzer, attr, prop.Value);
5050

5151
if (attrName == "Name")
@@ -60,7 +60,7 @@ void AnalyzeMessageAttach(BAMLAnalyzer analyzer, Tuple<IDnlibDef, AttributeInfoR
6060
if (attr.Item2 == null)
6161
return;
6262
var attrDeclType = analyzer.ResolveType(attr.Item2.OwnerTypeId);
63-
if (attrDeclType.FullName != "Caliburn.Micro.Message")
63+
if (attrDeclType.FullName != "Caliburn.Micro.Message" && attrDeclType.FullName != "System.Windows.Setter")
6464
return;
6565

6666
foreach (var msg in value.Split(';')) {
@@ -113,4 +113,4 @@ public void PostRename(ConfuserContext context, INameService service, Protection
113113
//
114114
}
115115
}
116-
}
116+
}

0 commit comments

Comments
 (0)