-
Notifications
You must be signed in to change notification settings - Fork 78
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Add a special channel to handle quoted identifiers and fix false…
… positives related to them on rules UnusedVariable, UnusedCursor, UnusedParameter and VariableHiding Fixes #186
- Loading branch information
Showing
12 changed files
with
183 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,9 +16,5 @@ | |
], | ||
"lnpls/plsql-language-fundamentals-52.sql" : [ | ||
7 | ||
], | ||
"lnpls/plsql-language-fundamentals-8.sql" : [ | ||
3, | ||
4 | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
zpa-core/src/main/kotlin/org/sonar/plsqlopen/lexer/QuotedIdentifierChannel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
/** | ||
* Z PL/SQL Analyzer | ||
* Copyright (C) 2015-2024 Felipe Zorzo | ||
* mailto:felipe AT felipezorzo DOT com DOT br | ||
* | ||
* This program is free software; you can redistribute it and/or | ||
* modify it under the terms of the GNU Lesser General Public | ||
* License as published by the Free Software Foundation; either | ||
* version 3 of the License, or (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
* Lesser General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Lesser General Public License | ||
* along with this program; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
*/ | ||
package org.sonar.plsqlopen.lexer | ||
|
||
import com.felipebz.flr.api.GenericTokenType | ||
import com.felipebz.flr.api.Token | ||
import com.felipebz.flr.channel.Channel | ||
import com.felipebz.flr.channel.CodeReader | ||
import com.felipebz.flr.impl.LexerOutput | ||
import java.util.regex.Pattern | ||
|
||
|
||
class QuotedIdentifierChannel(quotedIdentifierRegexp: String, simpleIdentifierRegexp: String) : Channel<LexerOutput> { | ||
|
||
private val quotedPattern = Pattern.compile(quotedIdentifierRegexp) | ||
private val quotedSimplePattern = Pattern.compile(""""$simpleIdentifierRegexp"""") | ||
|
||
override fun consume(code: CodeReader, output: LexerOutput): Boolean { | ||
val nextChar = code.peek().toChar() | ||
if (nextChar != '"') { | ||
return false | ||
} | ||
|
||
val tmpBuilder = StringBuilder() | ||
val matcher = quotedPattern.matcher("") | ||
|
||
if (code.popTo(matcher, tmpBuilder) > 0) { | ||
var word = tmpBuilder.toString() | ||
val wordOriginal = word | ||
if (quotedSimplePattern.matcher(word).matches() && word == word.uppercase()) { | ||
word = word.substring(1, word.length - 1) | ||
} | ||
|
||
val token = Token.builder() | ||
.setType(GenericTokenType.IDENTIFIER) | ||
.setValueAndOriginalValue(word, wordOriginal) | ||
.setLine(code.previousCursor.line) | ||
.setColumn(code.previousCursor.column) | ||
.build() | ||
output.addToken(token) | ||
return true | ||
} | ||
|
||
return false | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
zpa-core/src/test/kotlin/org/sonar/plsqlopen/lexer/QuotedIdentifierChannelTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
/** | ||
* Z PL/SQL Analyzer | ||
* Copyright (C) 2015-2024 Felipe Zorzo | ||
* mailto:felipe AT felipezorzo DOT com DOT br | ||
* | ||
* This program is free software; you can redistribute it and/or | ||
* modify it under the terms of the GNU Lesser General Public | ||
* License as published by the Free Software Foundation; either | ||
* version 3 of the License, or (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
* Lesser General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Lesser General Public License | ||
* along with this program; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
*/ | ||
package org.sonar.plsqlopen.lexer | ||
|
||
import com.felipebz.flr.api.GenericTokenType | ||
import com.felipebz.flr.impl.LexerOutput | ||
import com.felipebz.flr.tests.Assertions.assertThat | ||
import org.junit.jupiter.api.Test | ||
|
||
class QuotedIdentifierChannelTest { | ||
private val channel = QuotedIdentifierChannel("\".*?\"", "[A-Z]+") | ||
private val output = LexerOutput() | ||
|
||
@Test | ||
fun doesNotConsumeUnquotedWord() { | ||
assertThat(channel).doesNotConsume("word", output) | ||
} | ||
|
||
@Test | ||
fun consumeQuotedWord() { | ||
assertThat(channel).consume("\"some word\"", output) | ||
assertThat(output.tokens).hasToken("\"some word\"", GenericTokenType.IDENTIFIER) | ||
} | ||
|
||
@Test | ||
fun consumeQuotedWordWithSimpleIdentifier() { | ||
assertThat(channel).consume("\"WORD\"", output) | ||
assertThat(output.tokens).hasToken("WORD", GenericTokenType.IDENTIFIER) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters