Skip to content

Fix rare uncounted Ruby LOC #3109

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
Apr 13, 2020
Merged

Fix rare uncounted Ruby LOC #3109

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/ruby/RubyAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ public String getCtagsLang() {
* Gets a version number to be used to tag processed documents so that
* re-analysis can be re-done later if a stored version number is different
* from the current implementation.
* @return 20190118_01
* @return 20200410_00
*/
@Override
protected int getSpecializedVersionNo() {
return 20190118_01; // Edit comment above too!
return 20200410_00; // Edit comment above too!
}

/**
Expand Down
3 changes: 2 additions & 1 deletion opengrok-indexer/src/main/resources/analysis/ruby/RubyProductions.lexh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

/*
* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
* Portions Copyright (c) 2017, 2019, Chris Fraire <cfraire@me.com>.
* Portions Copyright (c) 2017, 2019-2020, Chris Fraire <cfraire@me.com>.
*/

/*
Expand Down Expand Up @@ -483,6 +483,7 @@ Here_EOF3 = [\`][^\r\n\`]*[\`]
}
// Only one char at a time due to restriction on {WhspChar} above.
[^\n\r] {
chkLOC();
maybeIntraState();
offer(yytext());
}
Expand Down
4 changes: 2 additions & 2 deletions opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/ruby/RubyXrefTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

/*
* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
* Portions Copyright (c) 2017, 2019, Chris Fraire <cfraire@me.com>.
* Portions Copyright (c) 2017, 2019-2020, Chris Fraire <cfraire@me.com>.
*/

package org.opengrok.indexer.analysis.ruby;
Expand All @@ -45,7 +45,7 @@ public void sampleTest() throws IOException {
writeAndCompare(new RubyAnalyzerFactory(),
"analysis/ruby/sample.rb",
"analysis/ruby/ruby_xrefres.html",
readTagsFromResource("analysis/ruby/sampletags"), 159);
readTagsFromResource("analysis/ruby/sampletags"), 161);
}

@Test
Expand Down
4 changes: 3 additions & 1 deletion opengrok-indexer/src/test/resources/analysis/ruby/ruby_xrefres.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,5 +183,7 @@
<a class="l" name="177" href="#177">177</a><b>print</b> <span class="s">&apos;<a href="http://example.com">http://example.com</a>&apos;</span>
<a class="l" name="178" href="#178">178</a><b>puts</b> <span class="s">&quot;Last #{</span><a href="/source/s?defs=log_lines" class="intelliWindow-symbol" data-definition-place="undefined-in-file">log_lines</a><span class="s">} lines from #{</span><a href="/source/s?defs=logfn" class="intelliWindow-symbol" data-definition-place="undefined-in-file">logfn</a><span class="s">}:&quot;</span>
<a class="l" name="179" href="#179">179</a><b>print</b> <span class="s">&quot;\n&quot;</span>
<a class="hl" name="180" href="#180">180</a></body>
<a class="hl" name="180" href="#180">180</a>;
<a class="l" name="181" href="#181">181</a>;
<a class="l" name="182" href="#182">182</a></body>
</html>
2 changes: 2 additions & 0 deletions opengrok-indexer/src/test/resources/analysis/ruby/sample.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,3 +177,5 @@ def right
print 'http://example.com'
puts "Last #{log_lines} lines from #{logfn}:"
print "\n"
;
;