Skip to content

[class-parse] fix Java8 javadoc regex matches and parameter name retrieval. #126

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

Merged
merged 1 commit into from
Feb 14, 2017
Merged

[class-parse] fix Java8 javadoc regex matches and parameter name retrieval. #126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 17 additions & 4 deletions src/Xamarin.Android.Tools.Bytecode/JavaDocumentScraper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,21 @@ public Java8DocScraper (string dir)
ShouldAlterArraySpec = true;
ShouldEliminateGenericArguments = true;
}

protected override string StripTagsFromParameters (string value)
{
// Java8 javadoc contains possibly linked types with <a> tags, so remove all of them.
while (value.IndexOf ('<') >= 0 && value.IndexOf ('>') > value.IndexOf ('<'))
value = value.Substring (0, value.IndexOf ('<')) + value.Substring (value.IndexOf ('>') + 1);
return value;
}
}

public abstract class AndroidDocScraper : IAndroidDocScraper
{
readonly String pattern_head;
readonly String reset_pattern_head;
readonly char [] parameter_pair_splitter;
readonly string [] parameter_pair_splitter;
readonly bool continuous_param_lines;
readonly String open_method;
readonly String param_sep;
Expand All @@ -145,7 +153,7 @@ protected AndroidDocScraper (string dir, String patternHead, String resetPattern

pattern_head = patternHead;
reset_pattern_head = resetPatternHead;
parameter_pair_splitter = (parameterPairSplitter != null ? parameterPairSplitter : "\\s+").ToCharArray ();
parameter_pair_splitter = new string [] { (parameterPairSplitter != null ? parameterPairSplitter : "\\s+") };
continuous_param_lines = continuousParamLines;
open_method = openMethod;
param_sep = paramSep;
Expand Down Expand Up @@ -178,6 +186,11 @@ protected virtual bool ShouldResetMatchBuffer (string text)
// I *know* this is a hack.
return reset_pattern_head == null || text.EndsWith (">", StringComparison.Ordinal) || !continuous_param_lines && !text.StartsWith (reset_pattern_head, StringComparison.Ordinal);
}

protected virtual string StripTagsFromParameters (string value)
{
return value;
}

public virtual String[] GetParameterNames (string package, string type, string method, string[] ptypes, bool isVarArgs)
{
Expand Down Expand Up @@ -223,14 +236,14 @@ public virtual String[] GetParameterNames (string package, string type, string m
var matcher = pattern.Match (text);
if (matcher.Success) {
var plist = matcher.Groups [1];
String[] parms = plist.Value.Split (new string [] {", "}, StringSplitOptions.RemoveEmptyEntries);
String[] parms = StripTagsFromParameters (plist.Value).Split (new string [] { ", " }, StringSplitOptions.RemoveEmptyEntries);
if (parms.Length != ptypes.Length) {
Log.Warning (1, "failed matching {0} (expected {1} params, got {2} params)", buffer, ptypes.Length, parms.Length);
return null;
}
String[] result = new String [ptypes.Length];
for (int i = 0; i < ptypes.Length; i++) {
String[] toks = parms [i].Split (parameter_pair_splitter);
String[] toks = parms [i].Split (parameter_pair_splitter, StringSplitOptions.RemoveEmptyEntries);
result [i] = toks [toks.Length - 1];
}
return result;
Expand Down