This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push: new afe53fc [NETBEANS-1074] Review Module javascript2.nodejs afe53fc is described below commit afe53fc5dc60c0241a4329ec17717fe1dadf08c5 Author: Svata Dedic <svatopluk.de...@oracle.com> AuthorDate: Mon Aug 20 20:48:42 2018 +0200 [NETBEANS-1074] Review Module javascript2.nodejs --- javascript2.nodejs/external/binaries-list | 16 ++++++++++++++++ .../qa-functional/data/SimpleNode/src/cc/cc1.js | 21 +++++++++++++++++---- .../qa-functional/data/SimpleNode/src/cc/cc2.js | 21 +++++++++++++++++---- .../qa-functional/data/SimpleNode/src/cc/cc4.js | 21 +++++++++++++++++---- .../qa-functional/data/SimpleNode/src/cc/foo.js | 19 +++++++++++++++++++ .../data/SimpleNode/src/core/mymod.js | 21 +++++++++++++++++---- .../data/SimpleNode/src/folder/arr.js | 21 +++++++++++++++++---- .../data/SimpleNode/src/folder/arrRef.js | 21 +++++++++++++++++---- .../data/SimpleNode/src/folder/newjavascript.js | 21 +++++++++++++++++---- .../data/TestNavigation/public_html/index.html | 22 +++++++++++++++++++--- .../js/issue247565/folder/literalRef247565.js | 21 +++++++++++++++++---- .../public_html/js/issue250329/s1.js | 21 +++++++++++++++++---- .../public_html/js/issue250329/s2.js | 21 +++++++++++++++++---- .../public_html/js/issue250329/s3.js | 21 +++++++++++++++++---- .../nodejs/editor/NodeJsDeclarationFinderTest.java | 14 +++++++------- 15 files changed, 248 insertions(+), 54 deletions(-) diff --git a/javascript2.nodejs/external/binaries-list b/javascript2.nodejs/external/binaries-list index 9490f90..f3e4210 100644 --- a/javascript2.nodejs/external/binaries-list +++ b/javascript2.nodejs/external/binaries-list @@ -1 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. 39405F982F7D0E5D0932219BE1D91358D316D0AE javascript2.nodejs-nodejs-resources.zip diff --git a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc1.js b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc1.js index d908bd6..5533024 100644 --- a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc1.js +++ b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc1.js @@ -1,7 +1,20 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ diff --git a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc2.js b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc2.js index 98715a5..eed99e7 100644 --- a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc2.js +++ b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc2.js @@ -1,7 +1,20 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ var mod = require("../core/mymod"); diff --git a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc4.js b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc4.js index 5ccc555..6076ff0 100644 --- a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc4.js +++ b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc4.js @@ -1,7 +1,20 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ diff --git a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/foo.js b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/foo.js index d814128..4f049f2 100644 --- a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/foo.js +++ b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/foo.js @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + exports.FreeList = function(name, max, constructor) { this.name = name; this.constructor = constructor; diff --git a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/core/mymod.js b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/core/mymod.js index 8432e83..20813d2 100644 --- a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/core/mymod.js +++ b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/core/mymod.js @@ -1,7 +1,20 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ function justCall(){ diff --git a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/folder/arr.js b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/folder/arr.js index b253b41..90c9e11 100644 --- a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/folder/arr.js +++ b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/folder/arr.js @@ -1,7 +1,20 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ diff --git a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/folder/arrRef.js b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/folder/arrRef.js index bdf28c1..1144f01 100644 --- a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/folder/arrRef.js +++ b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/folder/arrRef.js @@ -1,7 +1,20 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ diff --git a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/folder/newjavascript.js b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/folder/newjavascript.js index 502d68d..dbe6bf4 100644 --- a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/folder/newjavascript.js +++ b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/folder/newjavascript.js @@ -1,7 +1,20 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ var ee = req diff --git a/javascript2.nodejs/test/unit/data/TestNavigation/public_html/index.html b/javascript2.nodejs/test/unit/data/TestNavigation/public_html/index.html index c627c24..ae091c9 100644 --- a/javascript2.nodejs/test/unit/data/TestNavigation/public_html/index.html +++ b/javascript2.nodejs/test/unit/data/TestNavigation/public_html/index.html @@ -1,9 +1,25 @@ <!DOCTYPE html> <!-- -To change this license header, choose License Headers in Project Properties. -To change this template file, choose Tools | Templates -and open the template in the editor. + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> + <html> <head> <title>TODO supply a title</title> diff --git a/javascript2.nodejs/test/unit/data/TestNavigation/public_html/js/issue247565/folder/literalRef247565.js b/javascript2.nodejs/test/unit/data/TestNavigation/public_html/js/issue247565/folder/literalRef247565.js index d3a1aa6..185c03d 100644 --- a/javascript2.nodejs/test/unit/data/TestNavigation/public_html/js/issue247565/folder/literalRef247565.js +++ b/javascript2.nodejs/test/unit/data/TestNavigation/public_html/js/issue247565/folder/literalRef247565.js @@ -1,7 +1,20 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ diff --git a/javascript2.nodejs/test/unit/data/TestNavigation/public_html/js/issue250329/s1.js b/javascript2.nodejs/test/unit/data/TestNavigation/public_html/js/issue250329/s1.js index 80adb7f..b0ba709 100644 --- a/javascript2.nodejs/test/unit/data/TestNavigation/public_html/js/issue250329/s1.js +++ b/javascript2.nodejs/test/unit/data/TestNavigation/public_html/js/issue250329/s1.js @@ -1,7 +1,20 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ diff --git a/javascript2.nodejs/test/unit/data/TestNavigation/public_html/js/issue250329/s2.js b/javascript2.nodejs/test/unit/data/TestNavigation/public_html/js/issue250329/s2.js index b82ac1e..53c8f8b 100644 --- a/javascript2.nodejs/test/unit/data/TestNavigation/public_html/js/issue250329/s2.js +++ b/javascript2.nodejs/test/unit/data/TestNavigation/public_html/js/issue250329/s2.js @@ -1,7 +1,20 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ diff --git a/javascript2.nodejs/test/unit/data/TestNavigation/public_html/js/issue250329/s3.js b/javascript2.nodejs/test/unit/data/TestNavigation/public_html/js/issue250329/s3.js index 8eb27ad..f334cd7 100644 --- a/javascript2.nodejs/test/unit/data/TestNavigation/public_html/js/issue250329/s3.js +++ b/javascript2.nodejs/test/unit/data/TestNavigation/public_html/js/issue250329/s3.js @@ -1,7 +1,20 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ diff --git a/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJsDeclarationFinderTest.java b/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJsDeclarationFinderTest.java index 7d87aa0..514b210 100644 --- a/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJsDeclarationFinderTest.java +++ b/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJsDeclarationFinderTest.java @@ -142,37 +142,37 @@ public class NodeJsDeclarationFinderTest extends JsTestBase { @Test public void testIssue247565_09() throws Exception { - checkDeclaration("TestNavigation/public_html/js/issue247565/issue247565.js", "o2_247565.ob^j.conf.a;", "literalRef247565.js", 415); + checkDeclaration("TestNavigation/public_html/js/issue247565/issue247565.js", "o2_247565.ob^j.conf.a;", "literalRef247565.js", 1037); } @Test public void testIssue247565_10() throws Exception { - checkDeclaration("TestNavigation/public_html/js/issue247565/issue247565.js", "o2_247565.obj.co^nf.a;", "literalRef247565.js", 303); + checkDeclaration("TestNavigation/public_html/js/issue247565/issue247565.js", "o2_247565.obj.co^nf.a;", "literalRef247565.js", 925); } @Test public void testIssue247565_11() throws Exception { - checkDeclaration("TestNavigation/public_html/js/issue247565/issue247565.js", "o2_247565.obj.conf.a^;", "literalRef247565.js", 320); + checkDeclaration("TestNavigation/public_html/js/issue247565/issue247565.js", "o2_247565.obj.conf.a^;", "literalRef247565.js", 942); } @Test public void testIssue247565_12() throws Exception { - checkDeclaration("TestNavigation/public_html/js/issue247565/issue247565.js", "o2_247565.po^kus.getSeconds();", "literalRef247565.js", 392); + checkDeclaration("TestNavigation/public_html/js/issue247565/issue247565.js", "o2_247565.po^kus.getSeconds();", "literalRef247565.js", 1014); } @Test public void testIssue247565_13() throws Exception { - checkDeclaration("TestNavigation/public_html/js/issue247565/issue247565.js", "o2_247565.obj.d^ob.getFullYear();", "literalRef247565.js", 238); + checkDeclaration("TestNavigation/public_html/js/issue247565/issue247565.js", "o2_247565.obj.d^ob.getFullYear();", "literalRef247565.js", 860); } @Test public void testIssue247565_14() throws Exception { - checkDeclaration("TestNavigation/public_html/js/issue247565/issue247565.js", "o2_247565.obj.he^llo();", "literalRef247565.js", 265); + checkDeclaration("TestNavigation/public_html/js/issue247565/issue247565.js", "o2_247565.obj.he^llo();", "literalRef247565.js", 887); } @Test public void testIssue247565_15() throws Exception { - checkDeclaration("TestNavigation/public_html/js/issue247565/issue247565.js", "o2_247565.obj.ni^ck;", "literalRef247565.js", 218); + checkDeclaration("TestNavigation/public_html/js/issue247565/issue247565.js", "o2_247565.obj.ni^ck;", "literalRef247565.js", 840); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists