phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pr-127' into pmd/5.5.x

Browse Source
This commit is contained in:
Andreas Dangel
2016-11-26 10:35:12 +01:00
parent 9348d86eeb 716b628062
commit 1f467a9165
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/Search.java
View File

@@ -48,13 +48,14 @@ public class Search {
if (TRACE) {
System.out.println(" checking scope " + scope + " for name occurrence " + nameOccurrence);
}
if (!scope.contains(nameOccurrence) && scope.getParent() != null) {
final boolean isInScope = scope.contains(nameOccurrence);
if (!isInScope && scope.getParent() != null) {
if (TRACE) {
System.out.println(" moving up from " + scope + " to " + scope.getParent());
}
return searchUpward(nameOccurrence, scope.getParent());
}
if (scope.contains(nameOccurrence)) {
if (isInScope) {
if (TRACE) {
System.out.println(" found it!");
}

1
src/site/markdown/overview/changelog.md
View File

@@ -27,6 +27,7 @@
* [#123](https://github.com/pmd/pmd/pull/123): \[apex] Changing method names to lowercase so casing doesn't matter
* [#124](https://github.com/pmd/pmd/pull/124): \[java] CPD: Properly handle enums with `-ignore-identifiers`
* [#126](https://github.com/pmd/pmd/pull/126): \[java] Avoid creating a new String to qualify types
* [#127](https://github.com/pmd/pmd/pull/127): \[java] Don't look twice for the same variables
* [#129](https://github.com/pmd/pmd/pull/129): \[plsql] Added correct parse of IS [NOT] NULL and multiline DML
* [#135](https://github.com/pmd/pmd/pull/135): \[apex] New ruleset for Apex security