hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Merge branch 'master' into pmd/7.0.x

Browse Source
This commit is contained in:
Andreas Dangel
2022-05-06 15:06:23 +02:00
parent d23273921c d3880443f7
commit 8e90891b28
8 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.ci/files/project-list.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<projectlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="projectlist_1_1_0.xsd">
xsi:noNamespaceSchemaLocation="projectlist_1_1_0.xsd">
<description>Standard Projects</description>
<project>
@@ -151,23 +151,15 @@ fi
<project>
<name>Schedul-o-matic-9000</name>
<type>git</type>
<connection>https://github.com/pmd/Schedul-o-matic-9000</connection>
<!--
<connection>https://github.com/SalesforceLabs/Schedul-o-matic-9000</connection>
Note: using forked repo from pmd, as original repo doesn't have any useful tags/branches
-->
<tag>pmd-regression-test</tag>
<tag>6b1229ba43b38931fbbab5924bc9b9611d19a786</tag>
</project>
<project>
<name>fflib-apex-common</name>
<type>git</type>
<connection>https://github.com/pmd/fflib-apex-common</connection>
<!--
<connection>https://github.com/apex-enterprise-patterns/fflib-apex-common</connection>
Note: using forked repo from pmd, as original repo doesn't have any useful tags/branches
-->
<tag>pmd-regression-test</tag>
<tag>7e0891efb86d23de62811af56d87d0959082a322</tag>
</project>
<project>

4
Gemfile.lock
View File

@@ -68,14 +68,14 @@ GEM
multipart-post (2.1.1)
nap (1.1.0)
no_proxy_fix (0.1.2)
nokogiri (1.13.4)
nokogiri (1.13.5)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
octokit (4.22.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
open4 (1.3.4)
pmdtester (1.4.1)
pmdtester (1.5.0)
differ (~> 0.1)
liquid (~> 5.2)
logger-colors (~> 1.0)

2
docs/Gemfile.lock
View File

@@ -232,7 +232,7 @@ GEM
jekyll-seo-tag (~> 2.1)
minitest (5.15.0)
multipart-post (2.1.1)
nokogiri (1.13.4)
nokogiri (1.13.5)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
octokit (4.22.0)

3
docs/pages/release_notes.md
View File

@@ -21,6 +21,9 @@ This is a {{ site.pmd.release_type }} release.
### Fixed Issues
* javascript
* [#3948](https://github.com/pmd/pmd/issues/3948): \[js] Invalid operator error for method property in object literal
### API Changes
### External Contributions

2
pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractInfixEcmascriptNode.java
View File

@@ -19,7 +19,7 @@ abstract class AbstractInfixEcmascriptNode<T extends InfixExpression> extends Ab
if (setImage) {
if (infixExpression.getOperator() == Token.ASSIGN_BITXOR) {
super.setImage("^=");
} else {
} else if (infixExpression.getOperator() != Token.METHOD) {
super.setImage(AstRoot.operatorToString(infixExpression.getOperator()));
}
}

6
pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/JsTreeDumpTest.java
View File

@@ -40,4 +40,10 @@ public class JsTreeDumpTest extends BaseTreeDumpTest {
public void templateStrings() {
doTest("templateStrings");
}
@Test
public void issue3948() {
// https://github.com/pmd/pmd/issues/3948
doTest("issue3948");
}
}

3
pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/ast/testdata/issue3948.js vendored Normal file
View File

@@ -0,0 +1,3 @@
x = {
init() { }
};

9
pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/ast/testdata/issue3948.txt vendored Normal file
View File

@@ -0,0 +1,9 @@
+- AstRoot
+- ExpressionStatement
+- Assignment
+- Name
+- ObjectLiteral
+- ObjectProperty
+- Name
+- FunctionNode
+- Block