Skip to content

Commit 316fe9b

Browse files
idodeclareidodeclare
committed
Link single-char identifiers per Lubos
1 parent 6b0bfcb commit 316fe9b

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,7 @@ File = [a-zA-Z]{FNameChar}* "." ([cChHtTsS]|[cC][sS])
6464

6565
{Identifier} {
6666
String id = yytext();
67-
// N.b. for historical reasons, CSharpXref does not link identifiers of
68-
// length=1.
69-
if (id.length() > 1) {
70-
writeSymbol(id, Consts.kwd, yyline);
71-
} else {
72-
out.write(id);
73-
}
67+
writeSymbol(id, Consts.kwd, yyline);
7468
}
7569

7670
"<" ({File} | {FPath}) ">" {

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,14 @@
146146
<a class="l" name="138" href="#138">138</a><span class='fold-space'>&nbsp;</span>
147147
<a class="l" name="139" href="#139">139</a><span class='fold-space'>&nbsp;</span> <b>internal</b>
148148
<a class="hl" name="140" href="#140">140</a><span class='fold-space'>&nbsp;</span> <b>void</b>
149-
<span id='scope_id_b5ee0885' class='scope-head'><span class='scope-signature'>Serialize(object o)</span><a class="l" name="141" href="#141">141</a><a style='cursor:pointer;' onclick='fold(this.parentNode.id)' id='scope_id_b5ee0885_fold_icon'><span class='fold-icon'>&nbsp;</span></a> <a class="xmt" name="Serialize"/><a href="/source/s?refs=Serialize" class="xmt intelliWindow-symbol" data-definition-place="def">Serialize</a>(<b>object</b> o)</span>
149+
<span id='scope_id_b5ee0885' class='scope-head'><span class='scope-signature'>Serialize(object o)</span><a class="l" name="141" href="#141">141</a><a style='cursor:pointer;' onclick='fold(this.parentNode.id)' id='scope_id_b5ee0885_fold_icon'><span class='fold-icon'>&nbsp;</span></a> <a class="xmt" name="Serialize"/><a href="/source/s?refs=Serialize" class="xmt intelliWindow-symbol" data-definition-place="def">Serialize</a>(<b>object</b> <a class="xa" name="o"/><a href="/source/s?refs=o" class="xa intelliWindow-symbol" data-definition-place="def">o</a>)</span>
150150
<span id='scope_id_b5ee0885_fold' class='scope-body'><a class="l" name="142" href="#142">142</a><span class='fold-space'>&nbsp;</span> &#123;
151-
<a class="l" name="143" href="#143">143</a><span class='fold-space'>&nbsp;</span> <a href="/source/s?defs=Serialize" class="intelliWindow-symbol" data-definition-place="undefined-in-file">Serialize</a>(o, <b>this</b>.<a href="/source/s?defs=streamName" class="intelliWindow-symbol" data-definition-place="undefined-in-file">streamName</a>)&#59;
151+
<a class="l" name="143" href="#143">143</a><span class='fold-space'>&nbsp;</span> <a href="/source/s?defs=Serialize" class="intelliWindow-symbol" data-definition-place="undefined-in-file">Serialize</a>(<a href="/source/s?defs=o" class="intelliWindow-symbol" data-definition-place="undefined-in-file">o</a>, <b>this</b>.<a href="/source/s?defs=streamName" class="intelliWindow-symbol" data-definition-place="undefined-in-file">streamName</a>)&#59;
152152
<a class="l" name="144" href="#144">144</a><span class='fold-space'>&nbsp;</span> &#125;
153153
</span><a class="l" name="145" href="#145">145</a><span class='fold-space'>&nbsp;</span>
154154
<a class="l" name="146" href="#146">146</a><span class='fold-space'>&nbsp;</span> <b>internal</b>
155155
<a class="l" name="147" href="#147">147</a><span class='fold-space'>&nbsp;</span> <b>void</b>
156-
<span id='scope_id_4b08972e' class='scope-head'><span class='scope-signature'>Serialize(object o, string streamName)</span><a class="l" name="148" href="#148">148</a><a style='cursor:pointer;' onclick='fold(this.parentNode.id)' id='scope_id_4b08972e_fold_icon'><span class='fold-icon'>&nbsp;</span></a> <a class="xmt" name="Serialize"/><a href="/source/s?refs=Serialize" class="xmt intelliWindow-symbol" data-definition-place="def">Serialize</a>(<b>object</b> o, <b>string</b> <a class="xa" name="streamName"/><a href="/source/s?refs=streamName" class="xa intelliWindow-symbol" data-definition-place="def">streamName</a>)</span>
156+
<span id='scope_id_4b08972e' class='scope-head'><span class='scope-signature'>Serialize(object o, string streamName)</span><a class="l" name="148" href="#148">148</a><a style='cursor:pointer;' onclick='fold(this.parentNode.id)' id='scope_id_4b08972e_fold_icon'><span class='fold-icon'>&nbsp;</span></a> <a class="xmt" name="Serialize"/><a href="/source/s?refs=Serialize" class="xmt intelliWindow-symbol" data-definition-place="def">Serialize</a>(<b>object</b> <a class="xa" name="o"/><a href="/source/s?refs=o" class="xa intelliWindow-symbol" data-definition-place="def">o</a>, <b>string</b> <a class="xa" name="streamName"/><a href="/source/s?refs=streamName" class="xa intelliWindow-symbol" data-definition-place="def">streamName</a>)</span>
157157
<span id='scope_id_4b08972e_fold' class='scope-body'><a class="l" name="149" href="#149">149</a><span class='fold-space'>&nbsp;</span> &#123;
158158
<a class="hl" name="150" href="#150">150</a><span class='fold-space'>&nbsp;</span> <b>switch</b> (<a class="d intelliWindow-symbol" href="#format" data-definition-place="defined-in-file">format</a>)
159159
<a class="l" name="151" href="#151">151</a><span class='fold-space'>&nbsp;</span> &#123;
@@ -165,11 +165,11 @@
165165
<a class="l" name="157" href="#157">157</a><span class='fold-space'>&nbsp;</span> <a class="d intelliWindow-symbol" href="#_firstCall" data-definition-place="defined-in-file">_firstCall</a> = <b>false</b>&#59;
166166
<a class="l" name="158" href="#158">158</a><span class='fold-space'>&nbsp;</span> <a class="d intelliWindow-symbol" href="#textWriter" data-definition-place="defined-in-file">textWriter</a>.<a href="/source/s?defs=WriteLine" class="intelliWindow-symbol" data-definition-place="undefined-in-file">WriteLine</a>(<a href="/source/s?defs=Serialization" class="intelliWindow-symbol" data-definition-place="undefined-in-file">Serialization</a>.<a class="d intelliWindow-symbol" href="#XmlCliTag" data-definition-place="defined-in-file">XmlCliTag</a>)&#59;
167167
<a class="l" name="159" href="#159">159</a><span class='fold-space'>&nbsp;</span> &#125;
168-
<a class="hl" name="160" href="#160">160</a><span class='fold-space'>&nbsp;</span> <a class="d intelliWindow-symbol" href="#_xmlSerializer" data-definition-place="defined-in-file">_xmlSerializer</a>.<a href="/source/s?defs=Serialize" class="intelliWindow-symbol" data-definition-place="undefined-in-file">Serialize</a>(o, <a href="/source/s?defs=streamName" class="intelliWindow-symbol" data-definition-place="undefined-in-file">streamName</a>)&#59;
168+
<a class="hl" name="160" href="#160">160</a><span class='fold-space'>&nbsp;</span> <a class="d intelliWindow-symbol" href="#_xmlSerializer" data-definition-place="defined-in-file">_xmlSerializer</a>.<a href="/source/s?defs=Serialize" class="intelliWindow-symbol" data-definition-place="undefined-in-file">Serialize</a>(<a href="/source/s?defs=o" class="intelliWindow-symbol" data-definition-place="undefined-in-file">o</a>, <a href="/source/s?defs=streamName" class="intelliWindow-symbol" data-definition-place="undefined-in-file">streamName</a>)&#59;
169169
<a class="l" name="161" href="#161">161</a><span class='fold-space'>&nbsp;</span> <b>break</b>&#59;
170170
<a class="l" name="162" href="#162">162</a><span class='fold-space'>&nbsp;</span> <b>case</b> <a class="d intelliWindow-symbol" href="#DataFormat" data-definition-place="defined-in-file">DataFormat</a>.<a class="d intelliWindow-symbol" href="#Text" data-definition-place="defined-in-file">Text</a>:
171171
<a class="l" name="163" href="#163">163</a><span class='fold-space'>&nbsp;</span> <b>default</b>:
172-
<a class="l" name="164" href="#164">164</a><span class='fold-space'>&nbsp;</span> <a class="d intelliWindow-symbol" href="#textWriter" data-definition-place="defined-in-file">textWriter</a>.<a href="/source/s?defs=Write" class="intelliWindow-symbol" data-definition-place="undefined-in-file">Write</a>(o.<a href="/source/s?defs=ToString" class="intelliWindow-symbol" data-definition-place="undefined-in-file">ToString</a>())&#59;
172+
<a class="l" name="164" href="#164">164</a><span class='fold-space'>&nbsp;</span> <a class="d intelliWindow-symbol" href="#textWriter" data-definition-place="defined-in-file">textWriter</a>.<a href="/source/s?defs=Write" class="intelliWindow-symbol" data-definition-place="undefined-in-file">Write</a>(<a href="/source/s?defs=o" class="intelliWindow-symbol" data-definition-place="undefined-in-file">o</a>.<a href="/source/s?defs=ToString" class="intelliWindow-symbol" data-definition-place="undefined-in-file">ToString</a>())&#59;
173173
<a class="l" name="165" href="#165">165</a><span class='fold-space'>&nbsp;</span> <b>break</b>&#59;
174174
<a class="l" name="166" href="#166">166</a><span class='fold-space'>&nbsp;</span> &#125;
175175
<a class="l" name="167" href="#167">167</a><span class='fold-space'>&nbsp;</span> &#125;
@@ -250,7 +250,7 @@
250250
<a class="l" name="242" href="#242">242</a><span class='fold-space'>&nbsp;</span> <b>object</b>
251251
<span id='scope_id_6135420f' class='scope-head'><span class='scope-signature'>Deserialize()</span><a class="l" name="243" href="#243">243</a><a style='cursor:pointer;' onclick='fold(this.parentNode.id)' id='scope_id_6135420f_fold_icon'><span class='fold-icon'>&nbsp;</span></a> <a class="xmt" name="Deserialize"/><a href="/source/s?refs=Deserialize" class="xmt intelliWindow-symbol" data-definition-place="def">Deserialize</a>()</span>
252252
<span id='scope_id_6135420f_fold' class='scope-body'><a class="l" name="244" href="#244">244</a><span class='fold-space'>&nbsp;</span> &#123;
253-
<a class="l" name="245" href="#245">245</a><span class='fold-space'>&nbsp;</span> <b>object</b> o&#59;
253+
<a class="l" name="245" href="#245">245</a><span class='fold-space'>&nbsp;</span> <b>object</b> <a href="/source/s?defs=o" class="intelliWindow-symbol" data-definition-place="undefined-in-file">o</a>&#59;
254254
<a class="l" name="246" href="#246">246</a><span class='fold-space'>&nbsp;</span> <b>switch</b> (<a class="d intelliWindow-symbol" href="#format" data-definition-place="defined-in-file">format</a>)
255255
<a class="l" name="247" href="#247">247</a><span class='fold-space'>&nbsp;</span> &#123;
256256
<a class="l" name="248" href="#248">248</a><span class='fold-space'>&nbsp;</span> <b>case</b> <a class="d intelliWindow-symbol" href="#DataFormat" data-definition-place="defined-in-file">DataFormat</a>.<a class="d intelliWindow-symbol" href="#None" data-definition-place="defined-in-file">None</a>:
@@ -259,7 +259,7 @@
259259
<a class="l" name="251" href="#251">251</a><span class='fold-space'>&nbsp;</span>
260260
<a class="l" name="252" href="#252">252</a><span class='fold-space'>&nbsp;</span> <b>case</b> <a class="d intelliWindow-symbol" href="#DataFormat" data-definition-place="defined-in-file">DataFormat</a>.<a class="d intelliWindow-symbol" href="#XML" data-definition-place="defined-in-file">XML</a>:
261261
<a class="l" name="253" href="#253">253</a><span class='fold-space'>&nbsp;</span> <b>string</b> <a href="/source/s?defs=unused" class="intelliWindow-symbol" data-definition-place="undefined-in-file">unused</a>&#59;
262-
<a class="l" name="254" href="#254">254</a><span class='fold-space'>&nbsp;</span> o = <a class="d intelliWindow-symbol" href="#_xmlDeserializer" data-definition-place="defined-in-file">_xmlDeserializer</a>.<a class="d intelliWindow-symbol" href="#Deserialize" data-definition-place="defined-in-file">Deserialize</a>(<b>out</b> <a href="/source/s?defs=unused" class="intelliWindow-symbol" data-definition-place="undefined-in-file">unused</a>)&#59;
262+
<a class="l" name="254" href="#254">254</a><span class='fold-space'>&nbsp;</span> <a href="/source/s?defs=o" class="intelliWindow-symbol" data-definition-place="undefined-in-file">o</a> = <a class="d intelliWindow-symbol" href="#_xmlDeserializer" data-definition-place="defined-in-file">_xmlDeserializer</a>.<a class="d intelliWindow-symbol" href="#Deserialize" data-definition-place="defined-in-file">Deserialize</a>(<b>out</b> <a href="/source/s?defs=unused" class="intelliWindow-symbol" data-definition-place="undefined-in-file">unused</a>)&#59;
263263
<a class="l" name="255" href="#255">255</a><span class='fold-space'>&nbsp;</span> <b>break</b>&#59;
264264
<a class="l" name="256" href="#256">256</a><span class='fold-space'>&nbsp;</span>
265265
<a class="l" name="257" href="#257">257</a><span class='fold-space'>&nbsp;</span> <b>case</b> <a class="d intelliWindow-symbol" href="#DataFormat" data-definition-place="defined-in-file">DataFormat</a>.<a class="d intelliWindow-symbol" href="#Text" data-definition-place="defined-in-file">Text</a>:
@@ -270,20 +270,20 @@
270270
<a class="l" name="262" href="#262">262</a><span class='fold-space'>&nbsp;</span> &#125;
271271
<a class="l" name="263" href="#263">263</a><span class='fold-space'>&nbsp;</span> <b>if</b> (<a class="d intelliWindow-symbol" href="#_firstLine" data-definition-place="defined-in-file">_firstLine</a> != <b>null</b>)
272272
<a class="l" name="264" href="#264">264</a><span class='fold-space'>&nbsp;</span> &#123;
273-
<a class="l" name="265" href="#265">265</a><span class='fold-space'>&nbsp;</span> o = <a class="d intelliWindow-symbol" href="#_firstLine" data-definition-place="defined-in-file">_firstLine</a>&#59;
273+
<a class="l" name="265" href="#265">265</a><span class='fold-space'>&nbsp;</span> <a href="/source/s?defs=o" class="intelliWindow-symbol" data-definition-place="undefined-in-file">o</a> = <a class="d intelliWindow-symbol" href="#_firstLine" data-definition-place="defined-in-file">_firstLine</a>&#59;
274274
<a class="l" name="266" href="#266">266</a><span class='fold-space'>&nbsp;</span> <a class="d intelliWindow-symbol" href="#_firstLine" data-definition-place="defined-in-file">_firstLine</a> = <b>null</b>&#59;
275275
<a class="l" name="267" href="#267">267</a><span class='fold-space'>&nbsp;</span> &#125;
276276
<a class="l" name="268" href="#268">268</a><span class='fold-space'>&nbsp;</span> <b>else</b>
277277
<a class="l" name="269" href="#269">269</a><span class='fold-space'>&nbsp;</span> &#123;
278-
<a class="hl" name="270" href="#270">270</a><span class='fold-space'>&nbsp;</span> o = <a class="d intelliWindow-symbol" href="#textReader" data-definition-place="defined-in-file">textReader</a>.<a href="/source/s?defs=ReadLine" class="intelliWindow-symbol" data-definition-place="undefined-in-file">ReadLine</a>()&#59;
279-
<a class="l" name="271" href="#271">271</a><span class='fold-space'>&nbsp;</span> <b>if</b> (o == <b>null</b>)
278+
<a class="hl" name="270" href="#270">270</a><span class='fold-space'>&nbsp;</span> <a href="/source/s?defs=o" class="intelliWindow-symbol" data-definition-place="undefined-in-file">o</a> = <a class="d intelliWindow-symbol" href="#textReader" data-definition-place="defined-in-file">textReader</a>.<a href="/source/s?defs=ReadLine" class="intelliWindow-symbol" data-definition-place="undefined-in-file">ReadLine</a>()&#59;
279+
<a class="l" name="271" href="#271">271</a><span class='fold-space'>&nbsp;</span> <b>if</b> (<a href="/source/s?defs=o" class="intelliWindow-symbol" data-definition-place="undefined-in-file">o</a> == <b>null</b>)
280280
<a class="l" name="272" href="#272">272</a><span class='fold-space'>&nbsp;</span> &#123;
281281
<a class="l" name="273" href="#273">273</a><span class='fold-space'>&nbsp;</span> <a class="d intelliWindow-symbol" href="#_atEnd" data-definition-place="defined-in-file">_atEnd</a> = <b>true</b>&#59;
282282
<a class="l" name="274" href="#274">274</a><span class='fold-space'>&nbsp;</span> &#125;
283283
<a class="l" name="275" href="#275">275</a><span class='fold-space'>&nbsp;</span> &#125;
284284
<a class="l" name="276" href="#276">276</a><span class='fold-space'>&nbsp;</span> <b>break</b>&#59;
285285
<a class="l" name="277" href="#277">277</a><span class='fold-space'>&nbsp;</span> &#125;
286-
<a class="l" name="278" href="#278">278</a><span class='fold-space'>&nbsp;</span> <b>return</b> o&#59;
286+
<a class="l" name="278" href="#278">278</a><span class='fold-space'>&nbsp;</span> <b>return</b> <a href="/source/s?defs=o" class="intelliWindow-symbol" data-definition-place="undefined-in-file">o</a>&#59;
287287
<a class="l" name="279" href="#279">279</a><span class='fold-space'>&nbsp;</span> &#125;
288288
</span><a class="hl" name="280" href="#280">280</a><span class='fold-space'>&nbsp;</span>
289289
<a class="l" name="281" href="#281">281</a><span class='fold-space'>&nbsp;</span>

0 commit comments

Comments
 (0)