Skip to content

Commit 6b0bfcb

Browse files
committed
Fix to fine-tune URI link for CSharp COMMENT,QSTRING
1 parent 3a17e10 commit 6b0bfcb

File tree

4 files changed

+24
-12
lines changed

4 files changed

+24
-12
lines changed

src/org/opensolaris/opengrok/analysis/csharp/CSharpSymbolTokenizer.lex

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@
2727
*/
2828

2929
package org.opensolaris.opengrok.analysis.csharp;
30-
import java.io.IOException;
31-
import java.io.Reader;
32-
import org.opensolaris.opengrok.analysis.JFlexTokenizer;
3330

31+
import org.opensolaris.opengrok.analysis.JFlexTokenizer;
3432
%%
3533
%public
3634
%class CSharpSymbolTokenizer

src/org/opensolaris/opengrok/analysis/csharp/CSharpXref.lex

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,11 @@
2828
*/
2929

3030
package org.opensolaris.opengrok.analysis.csharp;
31+
3132
import org.opensolaris.opengrok.analysis.JFlexXrefSimple;
32-
import java.io.IOException;
33-
import java.io.Writer;
34-
import java.io.Reader;
33+
import org.opensolaris.opengrok.util.StringUtils;
3534
import org.opensolaris.opengrok.web.HtmlConsts;
3635
import org.opensolaris.opengrok.web.Util;
37-
3836
%%
3937
%public
4038
%class CSharpXref
@@ -183,12 +181,26 @@ File = [a-zA-Z]{FNameChar}* "." ([cChHtTsS]|[cC][sS])
183181
out.write(path);
184182
out.write("</a>");}
185183

186-
{BrowseableURI} {
187-
appendLink(yytext(), true);
188-
}
189-
190184
{FNameChar}+ "@" {FNameChar}+ "." {FNameChar}+
191185
{
192186
writeEMailAddress(yytext());
193187
}
194188
}
189+
190+
<STRING, SCOMMENT, VSTRING> {
191+
{BrowseableURI} {
192+
appendLink(yytext(), true);
193+
}
194+
}
195+
196+
<COMMENT> {
197+
{BrowseableURI} {
198+
appendLink(yytext(), true, StringUtils.END_C_COMMENT);
199+
}
200+
}
201+
202+
<QSTRING> {
203+
{BrowseableURI} {
204+
appendLink(yytext(), true, StringUtils.APOS_NO_BSESC);
205+
}
206+
}

test/org/opensolaris/opengrok/analysis/csharp/sample.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,3 +333,4 @@ class WrappedDeserializer : Serialization
333333
private bool _atEnd;
334334
}
335335
} // namespace
336+
/*http://example.com*/

test/org/opensolaris/opengrok/analysis/csharp/sample_xref.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,5 +341,6 @@
341341
<a class="l" name="333" href="#333">333</a><span class='fold-space'>&nbsp;</span> <b>private</b> <b>bool</b> <a href="/source/s?refs=_atEnd" class="xfld intelliWindow-symbol" data-definition-place="def">_atEnd</a>&#59;
342342
<a class="l" name="334" href="#334">334</a><span class='fold-space'>&nbsp;</span> &#125;
343343
<a class="l" name="335" href="#335">335</a><span class='fold-space'>&nbsp;</span>&#125; <span class="c">// namespace</span>
344-
<a class="l" name="336" href="#336">336</a><span class='fold-space'>&nbsp;</span></body>
344+
<a class="l" name="336" href="#336">336</a><span class='fold-space'>&nbsp;</span><span class="c">/*<a href="http://example.com">http://example.com</a>*/</span>
345+
<a class="l" name="337" href="#337">337</a><span class='fold-space'>&nbsp;</span></body>
345346
</html>

0 commit comments

Comments
 (0)