synched w/ trunk groovy_183
authorPetr Hejl <phejl@netbeans.org>
Mon, 07 Nov 2011 10:48:15 +0100
branchgroovy_183
changeset 214324479f53195a06
parent 212838 b38222e7bbe1
parent 214323 32d594950ca9
child 214325 0b05eecb83aa
synched w/ trunk
groovy.editor/external/groovy-all-1.6.4-license.txt
groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy.testinference2.completion
     1.1 --- a/groovy.editor/external/binaries-list	Mon Nov 07 09:55:19 2011 +0100
     1.2 +++ b/groovy.editor/external/binaries-list	Mon Nov 07 10:48:15 2011 +0100
     1.3 @@ -1,1 +1,1 @@
     1.4 -559C961A6CE793FAC94C8040253EA1FBD32B668B groovy-all-1.6.4.jar
     1.5 \ No newline at end of file
     1.6 +53AB87E4A55163CE59C8FA417132DDD43BF1D08A groovy-all-1.8.3.jar
     2.1 --- a/groovy.editor/external/groovy-all-1.6.4-license.txt	Mon Nov 07 09:55:19 2011 +0100
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,207 +0,0 @@
     2.4 -Name: Groovy
     2.5 -Version: 1.6.4
     2.6 -Description: Groovy Language distribution.
     2.7 -License: Apache-2.0
     2.8 -Origin: http://dist.groovy.codehaus.org/distributions/groovy-binary-1.6.4.zip
     2.9 -
    2.10 -                                 Apache License
    2.11 -                           Version 2.0, January 2004
    2.12 -                        http://www.apache.org/licenses/
    2.13 -
    2.14 -   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    2.15 -
    2.16 -   1. Definitions.
    2.17 -
    2.18 -      "License" shall mean the terms and conditions for use, reproduction,
    2.19 -      and distribution as defined by Sections 1 through 9 of this document.
    2.20 -
    2.21 -      "Licensor" shall mean the copyright owner or entity authorized by
    2.22 -      the copyright owner that is granting the License.
    2.23 -
    2.24 -      "Legal Entity" shall mean the union of the acting entity and all
    2.25 -      other entities that control, are controlled by, or are under common
    2.26 -      control with that entity. For the purposes of this definition,
    2.27 -      "control" means (i) the power, direct or indirect, to cause the
    2.28 -      direction or management of such entity, whether by contract or
    2.29 -      otherwise, or (ii) ownership of fifty percent (50%) or more of the
    2.30 -      outstanding shares, or (iii) beneficial ownership of such entity.
    2.31 -
    2.32 -      "You" (or "Your") shall mean an individual or Legal Entity
    2.33 -      exercising permissions granted by this License.
    2.34 -
    2.35 -      "Source" form shall mean the preferred form for making modifications,
    2.36 -      including but not limited to software source code, documentation
    2.37 -      source, and configuration files.
    2.38 -
    2.39 -      "Object" form shall mean any form resulting from mechanical
    2.40 -      transformation or translation of a Source form, including but
    2.41 -      not limited to compiled object code, generated documentation,
    2.42 -      and conversions to other media types.
    2.43 -
    2.44 -      "Work" shall mean the work of authorship, whether in Source or
    2.45 -      Object form, made available under the License, as indicated by a
    2.46 -      copyright notice that is included in or attached to the work
    2.47 -      (an example is provided in the Appendix below).
    2.48 -
    2.49 -      "Derivative Works" shall mean any work, whether in Source or Object
    2.50 -      form, that is based on (or derived from) the Work and for which the
    2.51 -      editorial revisions, annotations, elaborations, or other modifications
    2.52 -      represent, as a whole, an original work of authorship. For the purposes
    2.53 -      of this License, Derivative Works shall not include works that remain
    2.54 -      separable from, or merely link (or bind by name) to the interfaces of,
    2.55 -      the Work and Derivative Works thereof.
    2.56 -
    2.57 -      "Contribution" shall mean any work of authorship, including
    2.58 -      the original version of the Work and any modifications or additions
    2.59 -      to that Work or Derivative Works thereof, that is intentionally
    2.60 -      submitted to Licensor for inclusion in the Work by the copyright owner
    2.61 -      or by an individual or Legal Entity authorized to submit on behalf of
    2.62 -      the copyright owner. For the purposes of this definition, "submitted"
    2.63 -      means any form of electronic, verbal, or written communication sent
    2.64 -      to the Licensor or its representatives, including but not limited to
    2.65 -      communication on electronic mailing lists, source code control systems,
    2.66 -      and issue tracking systems that are managed by, or on behalf of, the
    2.67 -      Licensor for the purpose of discussing and improving the Work, but
    2.68 -      excluding communication that is conspicuously marked or otherwise
    2.69 -      designated in writing by the copyright owner as "Not a Contribution."
    2.70 -
    2.71 -      "Contributor" shall mean Licensor and any individual or Legal Entity
    2.72 -      on behalf of whom a Contribution has been received by Licensor and
    2.73 -      subsequently incorporated within the Work.
    2.74 -
    2.75 -   2. Grant of Copyright License. Subject to the terms and conditions of
    2.76 -      this License, each Contributor hereby grants to You a perpetual,
    2.77 -      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    2.78 -      copyright license to reproduce, prepare Derivative Works of,
    2.79 -      publicly display, publicly perform, sublicense, and distribute the
    2.80 -      Work and such Derivative Works in Source or Object form.
    2.81 -
    2.82 -   3. Grant of Patent License. Subject to the terms and conditions of
    2.83 -      this License, each Contributor hereby grants to You a perpetual,
    2.84 -      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    2.85 -      (except as stated in this section) patent license to make, have made,
    2.86 -      use, offer to sell, sell, import, and otherwise transfer the Work,
    2.87 -      where such license applies only to those patent claims licensable
    2.88 -      by such Contributor that are necessarily infringed by their
    2.89 -      Contribution(s) alone or by combination of their Contribution(s)
    2.90 -      with the Work to which such Contribution(s) was submitted. If You
    2.91 -      institute patent litigation against any entity (including a
    2.92 -      cross-claim or counterclaim in a lawsuit) alleging that the Work
    2.93 -      or a Contribution incorporated within the Work constitutes direct
    2.94 -      or contributory patent infringement, then any patent licenses
    2.95 -      granted to You under this License for that Work shall terminate
    2.96 -      as of the date such litigation is filed.
    2.97 -
    2.98 -   4. Redistribution. You may reproduce and distribute copies of the
    2.99 -      Work or Derivative Works thereof in any medium, with or without
   2.100 -      modifications, and in Source or Object form, provided that You
   2.101 -      meet the following conditions:
   2.102 -
   2.103 -      (a) You must give any other recipients of the Work or
   2.104 -          Derivative Works a copy of this License; and
   2.105 -
   2.106 -      (b) You must cause any modified files to carry prominent notices
   2.107 -          stating that You changed the files; and
   2.108 -
   2.109 -      (c) You must retain, in the Source form of any Derivative Works
   2.110 -          that You distribute, all copyright, patent, trademark, and
   2.111 -          attribution notices from the Source form of the Work,
   2.112 -          excluding those notices that do not pertain to any part of
   2.113 -          the Derivative Works; and
   2.114 -
   2.115 -      (d) If the Work includes a "NOTICE" text file as part of its
   2.116 -          distribution, then any Derivative Works that You distribute must
   2.117 -          include a readable copy of the attribution notices contained
   2.118 -          within such NOTICE file, excluding those notices that do not
   2.119 -          pertain to any part of the Derivative Works, in at least one
   2.120 -          of the following places: within a NOTICE text file distributed
   2.121 -          as part of the Derivative Works; within the Source form or
   2.122 -          documentation, if provided along with the Derivative Works; or,
   2.123 -          within a display generated by the Derivative Works, if and
   2.124 -          wherever such third-party notices normally appear. The contents
   2.125 -          of the NOTICE file are for informational purposes only and
   2.126 -          do not modify the License. You may add Your own attribution
   2.127 -          notices within Derivative Works that You distribute, alongside
   2.128 -          or as an addendum to the NOTICE text from the Work, provided
   2.129 -          that such additional attribution notices cannot be construed
   2.130 -          as modifying the License.
   2.131 -
   2.132 -      You may add Your own copyright statement to Your modifications and
   2.133 -      may provide additional or different license terms and conditions
   2.134 -      for use, reproduction, or distribution of Your modifications, or
   2.135 -      for any such Derivative Works as a whole, provided Your use,
   2.136 -      reproduction, and distribution of the Work otherwise complies with
   2.137 -      the conditions stated in this License.
   2.138 -
   2.139 -   5. Submission of Contributions. Unless You explicitly state otherwise,
   2.140 -      any Contribution intentionally submitted for inclusion in the Work
   2.141 -      by You to the Licensor shall be under the terms and conditions of
   2.142 -      this License, without any additional terms or conditions.
   2.143 -      Notwithstanding the above, nothing herein shall supersede or modify
   2.144 -      the terms of any separate license agreement you may have executed
   2.145 -      with Licensor regarding such Contributions.
   2.146 -
   2.147 -   6. Trademarks. This License does not grant permission to use the trade
   2.148 -      names, trademarks, service marks, or product names of the Licensor,
   2.149 -      except as required for reasonable and customary use in describing the
   2.150 -      origin of the Work and reproducing the content of the NOTICE file.
   2.151 -
   2.152 -   7. Disclaimer of Warranty. Unless required by applicable law or
   2.153 -      agreed to in writing, Licensor provides the Work (and each
   2.154 -      Contributor provides its Contributions) on an "AS IS" BASIS,
   2.155 -      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
   2.156 -      implied, including, without limitation, any warranties or conditions
   2.157 -      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
   2.158 -      PARTICULAR PURPOSE. You are solely responsible for determining the
   2.159 -      appropriateness of using or redistributing the Work and assume any
   2.160 -      risks associated with Your exercise of permissions under this License.
   2.161 -
   2.162 -   8. Limitation of Liability. In no event and under no legal theory,
   2.163 -      whether in tort (including negligence), contract, or otherwise,
   2.164 -      unless required by applicable law (such as deliberate and grossly
   2.165 -      negligent acts) or agreed to in writing, shall any Contributor be
   2.166 -      liable to You for damages, including any direct, indirect, special,
   2.167 -      incidental, or consequential damages of any character arising as a
   2.168 -      result of this License or out of the use or inability to use the
   2.169 -      Work (including but not limited to damages for loss of goodwill,
   2.170 -      work stoppage, computer failure or malfunction, or any and all
   2.171 -      other commercial damages or losses), even if such Contributor
   2.172 -      has been advised of the possibility of such damages.
   2.173 -
   2.174 -   9. Accepting Warranty or Additional Liability. While redistributing
   2.175 -      the Work or Derivative Works thereof, You may choose to offer,
   2.176 -      and charge a fee for, acceptance of support, warranty, indemnity,
   2.177 -      or other liability obligations and/or rights consistent with this
   2.178 -      License. However, in accepting such obligations, You may act only
   2.179 -      on Your own behalf and on Your sole responsibility, not on behalf
   2.180 -      of any other Contributor, and only if You agree to indemnify,
   2.181 -      defend, and hold each Contributor harmless for any liability
   2.182 -      incurred by, or claims asserted against, such Contributor by reason
   2.183 -      of your accepting any such warranty or additional liability.
   2.184 -
   2.185 -   END OF TERMS AND CONDITIONS
   2.186 -
   2.187 -   APPENDIX: How to apply the Apache License to your work.
   2.188 -
   2.189 -      To apply the Apache License to your work, attach the following
   2.190 -      boilerplate notice, with the fields enclosed by brackets "[]"
   2.191 -      replaced with your own identifying information. (Don't include
   2.192 -      the brackets!)  The text should be enclosed in the appropriate
   2.193 -      comment syntax for the file format. We also recommend that a
   2.194 -      file or class name and description of purpose be included on the
   2.195 -      same "printed page" as the copyright notice for easier
   2.196 -      identification within third-party archives.
   2.197 -
   2.198 -   Copyright [yyyy] [name of copyright owner]
   2.199 -
   2.200 -   Licensed under the Apache License, Version 2.0 (the "License");
   2.201 -   you may not use this file except in compliance with the License.
   2.202 -   You may obtain a copy of the License at
   2.203 -
   2.204 -       http://www.apache.org/licenses/LICENSE-2.0
   2.205 -
   2.206 -   Unless required by applicable law or agreed to in writing, software
   2.207 -   distributed under the License is distributed on an "AS IS" BASIS,
   2.208 -   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   2.209 -   See the License for the specific language governing permissions and
   2.210 -   limitations under the License.
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/groovy.editor/external/groovy-all-1.8.3-license.txt	Mon Nov 07 10:48:15 2011 +0100
     3.3 @@ -0,0 +1,207 @@
     3.4 +Name: Groovy
     3.5 +Version: 1.8.3
     3.6 +Description: Groovy Language distribution.
     3.7 +License: Apache-2.0
     3.8 +Origin: http://dist.groovy.codehaus.org/distributions/groovy-binary-1.8.3.zip
     3.9 +
    3.10 +                                 Apache License
    3.11 +                           Version 2.0, January 2004
    3.12 +                        http://www.apache.org/licenses/
    3.13 +
    3.14 +   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    3.15 +
    3.16 +   1. Definitions.
    3.17 +
    3.18 +      "License" shall mean the terms and conditions for use, reproduction,
    3.19 +      and distribution as defined by Sections 1 through 9 of this document.
    3.20 +
    3.21 +      "Licensor" shall mean the copyright owner or entity authorized by
    3.22 +      the copyright owner that is granting the License.
    3.23 +
    3.24 +      "Legal Entity" shall mean the union of the acting entity and all
    3.25 +      other entities that control, are controlled by, or are under common
    3.26 +      control with that entity. For the purposes of this definition,
    3.27 +      "control" means (i) the power, direct or indirect, to cause the
    3.28 +      direction or management of such entity, whether by contract or
    3.29 +      otherwise, or (ii) ownership of fifty percent (50%) or more of the
    3.30 +      outstanding shares, or (iii) beneficial ownership of such entity.
    3.31 +
    3.32 +      "You" (or "Your") shall mean an individual or Legal Entity
    3.33 +      exercising permissions granted by this License.
    3.34 +
    3.35 +      "Source" form shall mean the preferred form for making modifications,
    3.36 +      including but not limited to software source code, documentation
    3.37 +      source, and configuration files.
    3.38 +
    3.39 +      "Object" form shall mean any form resulting from mechanical
    3.40 +      transformation or translation of a Source form, including but
    3.41 +      not limited to compiled object code, generated documentation,
    3.42 +      and conversions to other media types.
    3.43 +
    3.44 +      "Work" shall mean the work of authorship, whether in Source or
    3.45 +      Object form, made available under the License, as indicated by a
    3.46 +      copyright notice that is included in or attached to the work
    3.47 +      (an example is provided in the Appendix below).
    3.48 +
    3.49 +      "Derivative Works" shall mean any work, whether in Source or Object
    3.50 +      form, that is based on (or derived from) the Work and for which the
    3.51 +      editorial revisions, annotations, elaborations, or other modifications
    3.52 +      represent, as a whole, an original work of authorship. For the purposes
    3.53 +      of this License, Derivative Works shall not include works that remain
    3.54 +      separable from, or merely link (or bind by name) to the interfaces of,
    3.55 +      the Work and Derivative Works thereof.
    3.56 +
    3.57 +      "Contribution" shall mean any work of authorship, including
    3.58 +      the original version of the Work and any modifications or additions
    3.59 +      to that Work or Derivative Works thereof, that is intentionally
    3.60 +      submitted to Licensor for inclusion in the Work by the copyright owner
    3.61 +      or by an individual or Legal Entity authorized to submit on behalf of
    3.62 +      the copyright owner. For the purposes of this definition, "submitted"
    3.63 +      means any form of electronic, verbal, or written communication sent
    3.64 +      to the Licensor or its representatives, including but not limited to
    3.65 +      communication on electronic mailing lists, source code control systems,
    3.66 +      and issue tracking systems that are managed by, or on behalf of, the
    3.67 +      Licensor for the purpose of discussing and improving the Work, but
    3.68 +      excluding communication that is conspicuously marked or otherwise
    3.69 +      designated in writing by the copyright owner as "Not a Contribution."
    3.70 +
    3.71 +      "Contributor" shall mean Licensor and any individual or Legal Entity
    3.72 +      on behalf of whom a Contribution has been received by Licensor and
    3.73 +      subsequently incorporated within the Work.
    3.74 +
    3.75 +   2. Grant of Copyright License. Subject to the terms and conditions of
    3.76 +      this License, each Contributor hereby grants to You a perpetual,
    3.77 +      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    3.78 +      copyright license to reproduce, prepare Derivative Works of,
    3.79 +      publicly display, publicly perform, sublicense, and distribute the
    3.80 +      Work and such Derivative Works in Source or Object form.
    3.81 +
    3.82 +   3. Grant of Patent License. Subject to the terms and conditions of
    3.83 +      this License, each Contributor hereby grants to You a perpetual,
    3.84 +      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    3.85 +      (except as stated in this section) patent license to make, have made,
    3.86 +      use, offer to sell, sell, import, and otherwise transfer the Work,
    3.87 +      where such license applies only to those patent claims licensable
    3.88 +      by such Contributor that are necessarily infringed by their
    3.89 +      Contribution(s) alone or by combination of their Contribution(s)
    3.90 +      with the Work to which such Contribution(s) was submitted. If You
    3.91 +      institute patent litigation against any entity (including a
    3.92 +      cross-claim or counterclaim in a lawsuit) alleging that the Work
    3.93 +      or a Contribution incorporated within the Work constitutes direct
    3.94 +      or contributory patent infringement, then any patent licenses
    3.95 +      granted to You under this License for that Work shall terminate
    3.96 +      as of the date such litigation is filed.
    3.97 +
    3.98 +   4. Redistribution. You may reproduce and distribute copies of the
    3.99 +      Work or Derivative Works thereof in any medium, with or without
   3.100 +      modifications, and in Source or Object form, provided that You
   3.101 +      meet the following conditions:
   3.102 +
   3.103 +      (a) You must give any other recipients of the Work or
   3.104 +          Derivative Works a copy of this License; and
   3.105 +
   3.106 +      (b) You must cause any modified files to carry prominent notices
   3.107 +          stating that You changed the files; and
   3.108 +
   3.109 +      (c) You must retain, in the Source form of any Derivative Works
   3.110 +          that You distribute, all copyright, patent, trademark, and
   3.111 +          attribution notices from the Source form of the Work,
   3.112 +          excluding those notices that do not pertain to any part of
   3.113 +          the Derivative Works; and
   3.114 +
   3.115 +      (d) If the Work includes a "NOTICE" text file as part of its
   3.116 +          distribution, then any Derivative Works that You distribute must
   3.117 +          include a readable copy of the attribution notices contained
   3.118 +          within such NOTICE file, excluding those notices that do not
   3.119 +          pertain to any part of the Derivative Works, in at least one
   3.120 +          of the following places: within a NOTICE text file distributed
   3.121 +          as part of the Derivative Works; within the Source form or
   3.122 +          documentation, if provided along with the Derivative Works; or,
   3.123 +          within a display generated by the Derivative Works, if and
   3.124 +          wherever such third-party notices normally appear. The contents
   3.125 +          of the NOTICE file are for informational purposes only and
   3.126 +          do not modify the License. You may add Your own attribution
   3.127 +          notices within Derivative Works that You distribute, alongside
   3.128 +          or as an addendum to the NOTICE text from the Work, provided
   3.129 +          that such additional attribution notices cannot be construed
   3.130 +          as modifying the License.
   3.131 +
   3.132 +      You may add Your own copyright statement to Your modifications and
   3.133 +      may provide additional or different license terms and conditions
   3.134 +      for use, reproduction, or distribution of Your modifications, or
   3.135 +      for any such Derivative Works as a whole, provided Your use,
   3.136 +      reproduction, and distribution of the Work otherwise complies with
   3.137 +      the conditions stated in this License.
   3.138 +
   3.139 +   5. Submission of Contributions. Unless You explicitly state otherwise,
   3.140 +      any Contribution intentionally submitted for inclusion in the Work
   3.141 +      by You to the Licensor shall be under the terms and conditions of
   3.142 +      this License, without any additional terms or conditions.
   3.143 +      Notwithstanding the above, nothing herein shall supersede or modify
   3.144 +      the terms of any separate license agreement you may have executed
   3.145 +      with Licensor regarding such Contributions.
   3.146 +
   3.147 +   6. Trademarks. This License does not grant permission to use the trade
   3.148 +      names, trademarks, service marks, or product names of the Licensor,
   3.149 +      except as required for reasonable and customary use in describing the
   3.150 +      origin of the Work and reproducing the content of the NOTICE file.
   3.151 +
   3.152 +   7. Disclaimer of Warranty. Unless required by applicable law or
   3.153 +      agreed to in writing, Licensor provides the Work (and each
   3.154 +      Contributor provides its Contributions) on an "AS IS" BASIS,
   3.155 +      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
   3.156 +      implied, including, without limitation, any warranties or conditions
   3.157 +      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
   3.158 +      PARTICULAR PURPOSE. You are solely responsible for determining the
   3.159 +      appropriateness of using or redistributing the Work and assume any
   3.160 +      risks associated with Your exercise of permissions under this License.
   3.161 +
   3.162 +   8. Limitation of Liability. In no event and under no legal theory,
   3.163 +      whether in tort (including negligence), contract, or otherwise,
   3.164 +      unless required by applicable law (such as deliberate and grossly
   3.165 +      negligent acts) or agreed to in writing, shall any Contributor be
   3.166 +      liable to You for damages, including any direct, indirect, special,
   3.167 +      incidental, or consequential damages of any character arising as a
   3.168 +      result of this License or out of the use or inability to use the
   3.169 +      Work (including but not limited to damages for loss of goodwill,
   3.170 +      work stoppage, computer failure or malfunction, or any and all
   3.171 +      other commercial damages or losses), even if such Contributor
   3.172 +      has been advised of the possibility of such damages.
   3.173 +
   3.174 +   9. Accepting Warranty or Additional Liability. While redistributing
   3.175 +      the Work or Derivative Works thereof, You may choose to offer,
   3.176 +      and charge a fee for, acceptance of support, warranty, indemnity,
   3.177 +      or other liability obligations and/or rights consistent with this
   3.178 +      License. However, in accepting such obligations, You may act only
   3.179 +      on Your own behalf and on Your sole responsibility, not on behalf
   3.180 +      of any other Contributor, and only if You agree to indemnify,
   3.181 +      defend, and hold each Contributor harmless for any liability
   3.182 +      incurred by, or claims asserted against, such Contributor by reason
   3.183 +      of your accepting any such warranty or additional liability.
   3.184 +
   3.185 +   END OF TERMS AND CONDITIONS
   3.186 +
   3.187 +   APPENDIX: How to apply the Apache License to your work.
   3.188 +
   3.189 +      To apply the Apache License to your work, attach the following
   3.190 +      boilerplate notice, with the fields enclosed by brackets "[]"
   3.191 +      replaced with your own identifying information. (Don't include
   3.192 +      the brackets!)  The text should be enclosed in the appropriate
   3.193 +      comment syntax for the file format. We also recommend that a
   3.194 +      file or class name and description of purpose be included on the
   3.195 +      same "printed page" as the copyright notice for easier
   3.196 +      identification within third-party archives.
   3.197 +
   3.198 +   Copyright [yyyy] [name of copyright owner]
   3.199 +
   3.200 +   Licensed under the Apache License, Version 2.0 (the "License");
   3.201 +   you may not use this file except in compliance with the License.
   3.202 +   You may obtain a copy of the License at
   3.203 +
   3.204 +       http://www.apache.org/licenses/LICENSE-2.0
   3.205 +
   3.206 +   Unless required by applicable law or agreed to in writing, software
   3.207 +   distributed under the License is distributed on an "AS IS" BASIS,
   3.208 +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   3.209 +   See the License for the specific language governing permissions and
   3.210 +   limitations under the License.
     4.1 --- a/groovy.editor/nbproject/project.properties	Mon Nov 07 09:55:19 2011 +0100
     4.2 +++ b/groovy.editor/nbproject/project.properties	Mon Nov 07 10:48:15 2011 +0100
     4.3 @@ -1,9 +1,10 @@
     4.4  javac.compilerargs=-Xlint -Xlint:-serial
     4.5  javac.source=1.6
     4.6  
     4.7 -cp.extra=external/groovy-all-1.6.4.jar
     4.8 +cp.extra=external/groovy-all-1.8.3.jar
     4.9  nbm.homepage=http://wiki.netbeans.org/groovy
    4.10  nbm.module.author=Martin Adamek, Petr Hejl, Matthias Schmidt
    4.11  nbm.needs.restart=true
    4.12 -release.external/groovy-all-1.6.4.jar=modules/ext/groovy-all.jar
    4.13 +release.external/groovy-all-1.8.3.jar=modules/ext/groovy-all.jar
    4.14  
    4.15 +requires.nb.javac=true
     5.1 --- a/groovy.editor/nbproject/project.xml	Mon Nov 07 09:55:19 2011 +0100
     5.2 +++ b/groovy.editor/nbproject/project.xml	Mon Nov 07 10:48:15 2011 +0100
     5.3 @@ -346,6 +346,10 @@
     5.4                          <test/>
     5.5                      </test-dependency>
     5.6                      <test-dependency>
     5.7 +                        <code-name-base>org.netbeans.modules.lexer.nbbridge</code-name-base>
     5.8 +                        <recursive/>
     5.9 +                    </test-dependency>
    5.10 +                    <test-dependency>
    5.11                          <code-name-base>org.netbeans.modules.masterfs</code-name-base>
    5.12                      </test-dependency>
    5.13                      <test-dependency>
    5.14 @@ -354,6 +358,11 @@
    5.15                          <compile-dependency/>
    5.16                      </test-dependency>
    5.17                      <test-dependency>
    5.18 +                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
    5.19 +                        <recursive/>
    5.20 +                        <compile-dependency/>
    5.21 +                    </test-dependency>
    5.22 +                    <test-dependency>
    5.23                          <code-name-base>org.netbeans.modules.projectui</code-name-base>
    5.24                          <compile-dependency/>
    5.25                      </test-dependency>
    5.26 @@ -386,7 +395,7 @@
    5.27              </friend-packages>
    5.28              <class-path-extension>
    5.29                  <runtime-relative-path>ext/groovy-all.jar</runtime-relative-path>
    5.30 -                <binary-origin>external/groovy-all-1.6.4.jar</binary-origin>
    5.31 +                <binary-origin>external/groovy-all-1.8.3.jar</binary-origin>
    5.32              </class-path-extension>
    5.33          </data>
    5.34      </configuration>
     6.1 --- a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/AstChildrenSupport.java	Mon Nov 07 09:55:19 2011 +0100
     6.2 +++ b/groovy.editor/src/org/netbeans/modules/groovy/editor/api/AstChildrenSupport.java	Mon Nov 07 10:48:15 2011 +0100
     6.3 @@ -50,7 +50,41 @@
     6.4  
     6.5  import org.codehaus.groovy.ast.ASTNode;
     6.6  import org.codehaus.groovy.ast.GroovyCodeVisitor;
     6.7 -import org.codehaus.groovy.ast.expr.*;
     6.8 +import org.codehaus.groovy.ast.expr.ArgumentListExpression;
     6.9 +import org.codehaus.groovy.ast.expr.ArrayExpression;
    6.10 +import org.codehaus.groovy.ast.expr.AttributeExpression;
    6.11 +import org.codehaus.groovy.ast.expr.BinaryExpression;
    6.12 +import org.codehaus.groovy.ast.expr.BitwiseNegationExpression;
    6.13 +import org.codehaus.groovy.ast.expr.BooleanExpression;
    6.14 +import org.codehaus.groovy.ast.expr.CastExpression;
    6.15 +import org.codehaus.groovy.ast.expr.ClassExpression;
    6.16 +import org.codehaus.groovy.ast.expr.ClosureExpression;
    6.17 +import org.codehaus.groovy.ast.expr.ClosureListExpression;
    6.18 +import org.codehaus.groovy.ast.expr.ConstantExpression;
    6.19 +import org.codehaus.groovy.ast.expr.ConstructorCallExpression;
    6.20 +import org.codehaus.groovy.ast.expr.DeclarationExpression;
    6.21 +import org.codehaus.groovy.ast.expr.ElvisOperatorExpression;
    6.22 +import org.codehaus.groovy.ast.expr.Expression;
    6.23 +import org.codehaus.groovy.ast.expr.FieldExpression;
    6.24 +import org.codehaus.groovy.ast.expr.GStringExpression;
    6.25 +import org.codehaus.groovy.ast.expr.ListExpression;
    6.26 +import org.codehaus.groovy.ast.expr.MapEntryExpression;
    6.27 +import org.codehaus.groovy.ast.expr.MapExpression;
    6.28 +import org.codehaus.groovy.ast.expr.MethodCallExpression;
    6.29 +import org.codehaus.groovy.ast.expr.MethodPointerExpression;
    6.30 +import org.codehaus.groovy.ast.expr.NotExpression;
    6.31 +import org.codehaus.groovy.ast.expr.PostfixExpression;
    6.32 +import org.codehaus.groovy.ast.expr.PrefixExpression;
    6.33 +import org.codehaus.groovy.ast.expr.PropertyExpression;
    6.34 +import org.codehaus.groovy.ast.expr.RangeExpression;
    6.35 +import org.codehaus.groovy.ast.expr.SpreadExpression;
    6.36 +import org.codehaus.groovy.ast.expr.SpreadMapExpression;
    6.37 +import org.codehaus.groovy.ast.expr.StaticMethodCallExpression;
    6.38 +import org.codehaus.groovy.ast.expr.TernaryExpression;
    6.39 +import org.codehaus.groovy.ast.expr.TupleExpression;
    6.40 +import org.codehaus.groovy.ast.expr.UnaryMinusExpression;
    6.41 +import org.codehaus.groovy.ast.expr.UnaryPlusExpression;
    6.42 +import org.codehaus.groovy.ast.expr.VariableExpression;
    6.43  import org.codehaus.groovy.ast.stmt.AssertStatement;
    6.44  import org.codehaus.groovy.ast.stmt.BlockStatement;
    6.45  import org.codehaus.groovy.ast.stmt.BreakStatement;
    6.46 @@ -298,9 +332,6 @@
    6.47      public void visitFieldExpression(FieldExpression expression) {
    6.48      }
    6.49  
    6.50 -    public void visitRegexExpression(RegexExpression expression) {
    6.51 -    }
    6.52 -
    6.53      public void visitGStringExpression(GStringExpression expression) {
    6.54          visitListOfExpressions(expression.getStrings());
    6.55          visitListOfExpressions(expression.getValues());
     7.1 --- a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/AstUtilities.java	Mon Nov 07 09:55:19 2011 +0100
     7.2 +++ b/groovy.editor/src/org/netbeans/modules/groovy/editor/api/AstUtilities.java	Mon Nov 07 10:48:15 2011 +0100
     7.3 @@ -185,6 +185,12 @@
     7.4              FieldNode fieldNode = (FieldNode) node;
     7.5              return getNextIdentifierByName(doc, fieldNode.getName(), start);
     7.6          } else if (node instanceof ClassNode) {
     7.7 +            // classnode for script does not have real declaration and thus
     7.8 +            // location
     7.9 +            if (((ClassNode) node).isScript()) {
    7.10 +                return OffsetRange.NONE;
    7.11 +            }
    7.12 +
    7.13              // ok, here we have to move the Range to the first character
    7.14              // after the "class" keyword, plus an indefinite nuber of spaces
    7.15              // FIXME: have to check what happens with other whitespaces between
    7.16 @@ -201,12 +207,13 @@
    7.17                  int start = getOffset(doc, lineNumber, columnNumber);
    7.18                  int limit = getLimit(node, doc, docLength);
    7.19  
    7.20 +
    7.21                  try {
    7.22                      // we have to really search for class keyword other keyword
    7.23                      // (such as abstract) can precede class
    7.24                      start = doc.find(new FinderFactory.StringFwdFinder("class", true), start, limit) + "class".length(); // NOI18N
    7.25                  } catch (BadLocationException ex) {
    7.26 -                    Exceptions.printStackTrace(ex);
    7.27 +                    LOGGER.log(Level.WARNING, null, ex);
    7.28                  }
    7.29  
    7.30                  if (start > docLength) {
     8.1 --- a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/PathFinderVisitor.java	Mon Nov 07 09:55:19 2011 +0100
     8.2 +++ b/groovy.editor/src/org/netbeans/modules/groovy/editor/api/PathFinderVisitor.java	Mon Nov 07 10:48:15 2011 +0100
     8.3 @@ -47,6 +47,7 @@
     8.4  import java.util.logging.Level;
     8.5  import java.util.logging.Logger;
     8.6  import org.codehaus.groovy.ast.ASTNode;
     8.7 +import org.codehaus.groovy.ast.AnnotatedNode;
     8.8  import org.codehaus.groovy.ast.ClassCodeVisitorSupport;
     8.9  import org.codehaus.groovy.ast.ClassNode;
    8.10  import org.codehaus.groovy.ast.ConstructorNode;
    8.11 @@ -81,7 +82,6 @@
    8.12  import org.codehaus.groovy.ast.expr.PrefixExpression;
    8.13  import org.codehaus.groovy.ast.expr.PropertyExpression;
    8.14  import org.codehaus.groovy.ast.expr.RangeExpression;
    8.15 -import org.codehaus.groovy.ast.expr.RegexExpression;
    8.16  import org.codehaus.groovy.ast.expr.SpreadExpression;
    8.17  import org.codehaus.groovy.ast.expr.SpreadMapExpression;
    8.18  import org.codehaus.groovy.ast.expr.StaticMethodCallExpression;
    8.19 @@ -476,13 +476,6 @@
    8.20      }
    8.21  
    8.22      @Override
    8.23 -    public void visitRegexExpression(RegexExpression node) {
    8.24 -        if (isInside(node, line, column)) {
    8.25 -            super.visitRegexExpression(node);
    8.26 -        }
    8.27 -    }
    8.28 -
    8.29 -    @Override
    8.30      public void visitGStringExpression(GStringExpression node) {
    8.31          if (isInside(node, line, column)) {
    8.32              super.visitGStringExpression(node);
    8.33 @@ -607,7 +600,7 @@
    8.34          }
    8.35  
    8.36          fixNode(node);
    8.37 -        
    8.38 +
    8.39          int beginLine = node.getLineNumber();
    8.40          int beginColumn = node.getColumnNumber();
    8.41          int endLine = node.getLastLineNumber();
    8.42 @@ -705,6 +698,12 @@
    8.43      }
    8.44  
    8.45      private boolean isInSource(ASTNode node) {
    8.46 +        if (node instanceof AnnotatedNode) {
    8.47 +            if (((AnnotatedNode) node).hasNoRealSourcePosition()) {
    8.48 +                return false;
    8.49 +            }
    8.50 +        }
    8.51 +
    8.52          // FIXME probably http://jira.codehaus.org/browse/GROOVY-3263
    8.53          if (node instanceof StaticMethodCallExpression && node.getLineNumber() == -1
    8.54                  && node.getLastLineNumber() == -1 && node.getColumnNumber() == -1
     9.1 --- a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/SemanticAnalysisVisitor.java	Mon Nov 07 09:55:19 2011 +0100
     9.2 +++ b/groovy.editor/src/org/netbeans/modules/groovy/editor/api/SemanticAnalysisVisitor.java	Mon Nov 07 10:48:15 2011 +0100
     9.3 @@ -48,6 +48,7 @@
     9.4  import java.util.HashMap;
     9.5  import java.util.Map;
     9.6  import java.util.Set;
     9.7 +import org.codehaus.groovy.ast.AnnotatedNode;
     9.8  import org.codehaus.groovy.ast.ClassCodeVisitorSupport;
     9.9  import org.codehaus.groovy.ast.ClassNode;
    9.10  import org.codehaus.groovy.ast.ConstructorNode;
    9.11 @@ -101,7 +102,7 @@
    9.12  
    9.13      @Override
    9.14      public void visitField(FieldNode node) {
    9.15 -        if (node.getLineNumber() > 0) {
    9.16 +        if (isInSource(node)) {
    9.17              OffsetRange range = AstUtilities.getRange(node, doc);
    9.18              EnumSet<ColoringAttributes> attributes = EnumSet.of(ColoringAttributes.FIELD);
    9.19  
    9.20 @@ -115,7 +116,7 @@
    9.21  
    9.22      @Override
    9.23      public void visitConstructor(ConstructorNode node) {
    9.24 -        if (node.getLineNumber() > 0) {
    9.25 +        if (isInSource(node)) {
    9.26              // Beware, a ConstructorNode is a MethodNode as well, (see below)
    9.27              // but we have to catch the Constructors first.
    9.28              OffsetRange range = AstUtilities.getRange(node, doc);
    9.29 @@ -126,7 +127,7 @@
    9.30  
    9.31      @Override
    9.32      public void visitMethod(MethodNode node) {
    9.33 -        if (node.getLineNumber() > 0) {
    9.34 +        if (isInSource(node)) {
    9.35              OffsetRange range = AstUtilities.getRange(node, doc);
    9.36              EnumSet<ColoringAttributes> attributes = EnumSet.of(ColoringAttributes.METHOD);
    9.37  
    9.38 @@ -150,7 +151,7 @@
    9.39  
    9.40      @Override
    9.41      public void visitClass(ClassNode node) {
    9.42 -        if (node.getLineNumber() > 0) {
    9.43 +        if (isInSource(node)) {
    9.44              OffsetRange range = AstUtilities.getRange(node, doc);
    9.45              highlights.put(range, ColoringAttributes.CLASS_SET);
    9.46          }
    9.47 @@ -162,11 +163,15 @@
    9.48          Variable var = node.getAccessedVariable();
    9.49  
    9.50          if (var instanceof FieldNode) {
    9.51 -            if (node.getLineNumber() > 0) {
    9.52 +            if (isInSource(node)) {
    9.53                  OffsetRange range = AstUtilities.getRange(node, doc);
    9.54                  highlights.put(range, ColoringAttributes.FIELD_SET);
    9.55              }
    9.56          }
    9.57          super.visitVariableExpression(node);
    9.58      }
    9.59 +
    9.60 +    private boolean isInSource(AnnotatedNode node) {
    9.61 +        return node.getLineNumber() > 0 && !node.hasNoRealSourcePosition();
    9.62 +    }
    9.63  }
    10.1 --- a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/StructureAnalyzer.java	Mon Nov 07 09:55:19 2011 +0100
    10.2 +++ b/groovy.editor/src/org/netbeans/modules/groovy/editor/api/StructureAnalyzer.java	Mon Nov 07 10:48:15 2011 +0100
    10.3 @@ -73,6 +73,7 @@
    10.4  import java.util.Iterator;
    10.5  import java.util.logging.Level;
    10.6  import java.util.logging.Logger;
    10.7 +import org.codehaus.groovy.ast.AnnotatedNode;
    10.8  import org.codehaus.groovy.ast.ConstructorNode;
    10.9  import org.codehaus.groovy.ast.PropertyNode;
   10.10  import org.netbeans.api.annotations.common.NullAllowed;
   10.11 @@ -189,51 +190,54 @@
   10.12      }
   10.13  
   10.14      private void scan(GroovyParserResult result, ASTNode node, AstPath path, String in, Set<String> includes, AstElement parent) {
   10.15 +        if (node instanceof AnnotatedNode
   10.16 +                && !((AnnotatedNode) node).hasNoRealSourcePosition()) {
   10.17  
   10.18 -        if (node instanceof ClassNode) {
   10.19 -            AstClassElement co = new AstClassElement(result, node);
   10.20 -            co.setFqn(((ClassNode) node).getName());
   10.21 +            if (node instanceof ClassNode) {
   10.22 +                AstClassElement co = new AstClassElement(result, node);
   10.23 +                co.setFqn(((ClassNode) node).getName());
   10.24  
   10.25 -            if (parent != null) {
   10.26 -                parent.addChild(co);
   10.27 -            } else {
   10.28 -                structure.add(co);
   10.29 -            }
   10.30 -
   10.31 -            parent = co;
   10.32 -        } else if (node instanceof FieldNode) {
   10.33 -            if (parent instanceof AstClassElement) {
   10.34 -                // We don't have unique declarations, only assignments (possibly many)
   10.35 -                // so stash these in a map and extract unique fields when we're done
   10.36 -                Set<FieldNode> assignments = fields.get(parent);
   10.37 -
   10.38 -                if (assignments == null) {
   10.39 -                    assignments = new HashSet<FieldNode>();
   10.40 -                    fields.put((AstClassElement) parent, assignments);
   10.41 +                if (parent != null) {
   10.42 +                    parent.addChild(co);
   10.43 +                } else {
   10.44 +                    structure.add(co);
   10.45                  }
   10.46  
   10.47 -                assignments.add((FieldNode) node);
   10.48 +                parent = co;
   10.49 +            } else if (node instanceof FieldNode) {
   10.50 +                if (parent instanceof AstClassElement) {
   10.51 +                    // We don't have unique declarations, only assignments (possibly many)
   10.52 +                    // so stash these in a map and extract unique fields when we're done
   10.53 +                    Set<FieldNode> assignments = fields.get(parent);
   10.54 +
   10.55 +                    if (assignments == null) {
   10.56 +                        assignments = new HashSet<FieldNode>();
   10.57 +                        fields.put((AstClassElement) parent, assignments);
   10.58 +                    }
   10.59 +
   10.60 +                    assignments.add((FieldNode) node);
   10.61 +                }
   10.62 +            } else if (node instanceof MethodNode) {
   10.63 +                AstMethodElement co = new AstMethodElement(result, node);
   10.64 +                methods.add(co);
   10.65 +                co.setIn(in);
   10.66 +
   10.67 +                // TODO - don't add this to the top level! Make a nested list
   10.68 +                if (parent != null) {
   10.69 +                    parent.addChild(co);
   10.70 +                } else {
   10.71 +                    structure.add(co);
   10.72 +                }
   10.73 +            } else if (node instanceof PropertyNode) {
   10.74 +                Set<PropertyNode> declarations = properties.get(parent);
   10.75 +
   10.76 +                if (declarations == null) {
   10.77 +                    declarations = new HashSet<PropertyNode>();
   10.78 +                    properties.put((AstClassElement) parent, declarations);
   10.79 +                }
   10.80 +
   10.81 +                declarations.add((PropertyNode) node);
   10.82              }
   10.83 -        } else if (node instanceof MethodNode) {
   10.84 -            AstMethodElement co = new AstMethodElement(result, node);
   10.85 -            methods.add(co);
   10.86 -            co.setIn(in);
   10.87 -
   10.88 -            // TODO - don't add this to the top level! Make a nested list
   10.89 -            if (parent != null) {
   10.90 -                parent.addChild(co);
   10.91 -            } else {
   10.92 -                structure.add(co);
   10.93 -            }
   10.94 -        } else if (node instanceof PropertyNode) {
   10.95 -            Set<PropertyNode> declarations = properties.get(parent);
   10.96 -
   10.97 -            if (declarations == null) {
   10.98 -                declarations = new HashSet<PropertyNode>();
   10.99 -                properties.put((AstClassElement) parent, declarations);
  10.100 -            }
  10.101 -
  10.102 -            declarations.add((PropertyNode) node);
  10.103          }
  10.104  
  10.105          @SuppressWarnings("unchecked")
    11.1 --- a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/Bundle.properties	Mon Nov 07 09:55:19 2011 +0100
    11.2 +++ b/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/Bundle.properties	Mon Nov 07 10:48:15 2011 +0100
    11.3 @@ -41,4 +41,4 @@
    11.4  # made subject to such option by the copyright holder.
    11.5  
    11.6  GroovyCompletion_NoJavaDocFound=<h2>Unable to find the doc for JDK/GDK.</h2><br>\
    11.7 -You can configure GDK 1.6.4 doc folder in Tools/Options/Miscellaneous/Groovy.
    11.8 +You can configure GDK 1.8.3 doc folder in Tools/Options/Miscellaneous/Groovy.
    12.1 --- a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CompletionHandler.java	Mon Nov 07 09:55:19 2011 +0100
    12.2 +++ b/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CompletionHandler.java	Mon Nov 07 10:48:15 2011 +0100
    12.3 @@ -86,6 +86,7 @@
    12.4  import org.codehaus.groovy.ast.expr.ArgumentListExpression;
    12.5  import org.codehaus.groovy.ast.expr.ClassExpression;
    12.6  import org.codehaus.groovy.ast.expr.ClosureExpression;
    12.7 +import org.codehaus.groovy.ast.expr.ConstantExpression;
    12.8  import org.codehaus.groovy.ast.expr.DeclarationExpression;
    12.9  import org.codehaus.groovy.ast.expr.Expression;
   12.10  import org.codehaus.groovy.ast.expr.RangeExpression;
   12.11 @@ -1880,16 +1881,12 @@
   12.12              }
   12.13  
   12.14              // this returns a list of String's of wildcard-like included types.
   12.15 -            List<String> importsPkg = mn.getImportPackages();
   12.16 -
   12.17 -            for (String wildcardImport : importsPkg) {
   12.18 -                LOG.log(Level.FINEST, "From getImportPackages() : {0} ", wildcardImport);
   12.19 -                if (wildcardImport.endsWith(".")) {
   12.20 -                    wildcardImport = wildcardImport.substring(0, wildcardImport.length() - 1);
   12.21 -                }
   12.22 -
   12.23 -                localDefaultImports.add(wildcardImport);
   12.24 -
   12.25 +            List<ImportNode> importNodes = mn.getStarImports();
   12.26 +
   12.27 +            for (ImportNode wildcardImport : importNodes) {
   12.28 +                LOG.log(Level.FINEST, "From getImportPackages() : {0} ", wildcardImport.getText());
   12.29 +
   12.30 +                localDefaultImports.add(wildcardImport.getPackageName());
   12.31              }
   12.32  
   12.33          }
   12.34 @@ -2148,6 +2145,12 @@
   12.35                      expression.setType(
   12.36                              new ClassNode("groovy.lang.Range", ClassNode.ACC_PUBLIC | ClassNode.ACC_INTERFACE, null)); // NOI18N
   12.37                  }
   12.38 +            // FIXME report issue
   12.39 +            } else if (expression instanceof ConstantExpression) {
   12.40 +                ConstantExpression constantExpression = (ConstantExpression) expression;
   12.41 +                if (!constantExpression.isNullExpression()) {
   12.42 +                    constantExpression.setType(new ClassNode(constantExpression.getValue().getClass()));
   12.43 +                }
   12.44              }
   12.45              request.declaringClass = expression.getType();
   12.46          }
    13.1 --- a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProvider.java	Mon Nov 07 09:55:19 2011 +0100
    13.2 +++ b/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProvider.java	Mon Nov 07 10:48:15 2011 +0100
    13.3 @@ -785,9 +785,13 @@
    13.4              //
    13.5              imports.addAll(Arrays.asList(ResolveVisitor.DEFAULT_IMPORTS));
    13.6  
    13.7 +            // FIXME by using star imports in generated class
    13.8 +            // we could cause namespace collision
    13.9              ModuleNode moduleNode = classNode.getModule();
   13.10 -            for (Iterator it = moduleNode.getImportPackages().iterator(); it.hasNext();) {
   13.11 -                imports.add(it.next());
   13.12 +            for (ImportNode importNode : moduleNode.getImports()) {
   13.13 +                if (importNode.isStar()) {
   13.14 +                    imports.add(importNode.getPackageName() + ".");
   13.15 +                }
   13.16              }
   13.17  
   13.18              for (Iterator it = moduleNode.getImports().iterator(); it.hasNext();) {
    14.1 --- a/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/JavaElementHandler.java	Mon Nov 07 09:55:19 2011 +0100
    14.2 +++ b/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/JavaElementHandler.java	Mon Nov 07 10:48:15 2011 +0100
    14.3 @@ -273,11 +273,12 @@
    14.4                              break;
    14.5                          }
    14.6                      }
    14.7 -                    if (j >= 0 && j < typeParameters.length) {
    14.8 -                        typeString = typeParameters[j];
    14.9 -                    } else {
   14.10 +// FIXME why we were doing this for signatures ??
   14.11 +//                    if (j >= 0 && j < typeParameters.length) {
   14.12 +//                        typeString = typeParameters[j];
   14.13 +//                    } else {
   14.14                          typeString = types.erasure(type).toString();
   14.15 -                    }
   14.16 +//                    }
   14.17                  } else {
   14.18                      typeString = type.toString();
   14.19                  }
    15.1 --- a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/Bundle.properties	Mon Nov 07 09:55:19 2011 +0100
    15.2 +++ b/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/Bundle.properties	Mon Nov 07 10:48:15 2011 +0100
    15.3 @@ -87,4 +87,4 @@
    15.4  GSF_TYPESYMBOL=Type Symbol
    15.5  QUOTED_STRING_LITERAL=Quoted String Literal
    15.6  
    15.7 -groovy-all=Groovy 1.6.4
    15.8 +groovy-all=Groovy 1.8.3
    16.1 --- a/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/groovy-all.xml	Mon Nov 07 09:55:19 2011 +0100
    16.2 +++ b/groovy.editor/src/org/netbeans/modules/groovy/editor/resources/groovy-all.xml	Mon Nov 07 10:48:15 2011 +0100
    16.3 @@ -57,7 +57,7 @@
    16.4      <volume>
    16.5          <!-- please check with mkleint@netbeans.org before/after updating this or "classpath" section -->
    16.6          <type>maven-pom</type>
    16.7 -        <resource>http://repo1.maven.org/maven2/org/codehaus/groovy/groovy-all/1.6.4/groovy-all-1.6.4.pom</resource>
    16.8 +        <resource>http://repo1.maven.org/maven2/org/codehaus/groovy/groovy-all/1.8.3/groovy-all-1.8.3.pom</resource>
    16.9      </volume>
   16.10      
   16.11  </library>
    17.1 --- a/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldString2.groovy.testClassMethodFieldString2.completion	Mon Nov 07 09:55:19 2011 +0100
    17.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/ClassMethodFieldString2.groovy.testClassMethodFieldString2.completion	Mon Nov 07 10:48:15 2011 +0100
    17.3 @@ -6,4 +6,6 @@
    17.4  METHOD     split(Closure)                             Collection
    17.5  METHOD     split(String)                   [PUBLIC]   String[]
    17.6  METHOD     split(String, int)              [PUBLIC]   String[]
    17.7 +METHOD     splitEachLine(CharSequence, Cl             Object
    17.8 +METHOD     splitEachLine(Pattern, Closure             Object
    17.9  METHOD     splitEachLine(String, Closure)             Object
    18.1 --- a/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalString2.groovy.testClassMethodLocalString2.completion	Mon Nov 07 09:55:19 2011 +0100
    18.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/ClassMethodLocalString2.groovy.testClassMethodLocalString2.completion	Mon Nov 07 10:48:15 2011 +0100
    18.3 @@ -9,11 +9,12 @@
    18.4  METHOD     getAt(String)                              Object
    18.5  METHOD     getAt(int)                                 String
    18.6  METHOD     getBytes()                      [PUBLIC]   byte[]
    18.7 +METHOD     getBytes(Charset)               [PUBLIC]   byte[]
    18.8  METHOD     getBytes(String)                [PUBLIC]   byte[]
    18.9  METHOD     getBytes(int, int, byte[], int  [PUBLIC]   void
   18.10  METHOD     getChars()                                 char[]
   18.11  METHOD     getChars(int, int, char[], int  [PUBLIC]   void
   18.12 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
   18.13 +METHOD     getClass()                      [PUBLIC]   Class<?>
   18.14  METHOD     getMetaClass()                             MetaClass
   18.15  METHOD     getMetaPropertyValues()                    List
   18.16  METHOD     getProperties()                            Map
    19.1 --- a/groovy.editor/test/unit/data/testfiles/completion/MethodCompletionTestCase.groovy.testMethodCompletion1.completion	Mon Nov 07 09:55:19 2011 +0100
    19.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/MethodCompletionTestCase.groovy.testMethodCompletion1.completion	Mon Nov 07 10:48:15 2011 +0100
    19.3 @@ -2,5 +2,6 @@
    19.4  new String().toS|
    19.5  (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
    19.6  ------------------------------------
    19.7 +METHOD     toSet()                                    Set
    19.8  METHOD     toShort()                                  Short
    19.9  METHOD     toString()                      [PUBLIC]   String
    20.1 --- a/groovy.editor/test/unit/data/testfiles/completion/MethodCompletionTestCase.groovy.testMethodCompletion2.completion	Mon Nov 07 09:55:19 2011 +0100
    20.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/MethodCompletionTestCase.groovy.testMethodCompletion2.completion	Mon Nov 07 10:48:15 2011 +0100
    20.3 @@ -2,11 +2,17 @@
    20.4  new String().find|
    20.5  (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
    20.6  ------------------------------------
    20.7 +METHOD     find()                                     Object
    20.8 +METHOD     find(CharSequence)                         CharSequence
    20.9 +METHOD     find(CharSequence, Closure)                CharSequence
   20.10  METHOD     find(Closure)                              Object
   20.11  METHOD     find(Pattern)                              String
   20.12  METHOD     find(Pattern, Closure)                     String
   20.13  METHOD     find(String)                               String
   20.14  METHOD     find(String, Closure)                      String
   20.15 +METHOD     findAll()                                  Collection
   20.16 +METHOD     findAll(CharSequence)                      List
   20.17 +METHOD     findAll(CharSequence, Closure)             List
   20.18  METHOD     findAll(Closure)                           Collection
   20.19  METHOD     findAll(Pattern)                           List
   20.20  METHOD     findAll(Pattern, Closure)                  List
   20.21 @@ -18,3 +24,5 @@
   20.22  METHOD     findIndexValues(Number, Closur             List
   20.23  METHOD     findLastIndexOf(Closure)                   int
   20.24  METHOD     findLastIndexOf(int, Closure)              int
   20.25 +METHOD     findResult(Closure)                        Object
   20.26 +METHOD     findResult(Object, Closure)                Object
    21.1 --- a/groovy.editor/test/unit/data/testfiles/completion/ScriptString2.groovy.testScriptString2.completion	Mon Nov 07 09:55:19 2011 +0100
    21.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/ScriptString2.groovy.testScriptString2.completion	Mon Nov 07 10:48:15 2011 +0100
    21.3 @@ -6,4 +6,6 @@
    21.4  METHOD     split(Closure)                             Collection
    21.5  METHOD     split(String)                   [PUBLIC]   String[]
    21.6  METHOD     split(String, int)              [PUBLIC]   String[]
    21.7 +METHOD     splitEachLine(CharSequence, Cl             Object
    21.8 +METHOD     splitEachLine(Pattern, Closure             Object
    21.9  METHOD     splitEachLine(String, Closure)             Object
    22.1 --- a/groovy.editor/test/unit/data/testfiles/completion/ScriptStringConst1.groovy.testScriptStringConst1.completion	Mon Nov 07 09:55:19 2011 +0100
    22.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/ScriptStringConst1.groovy.testScriptStringConst1.completion	Mon Nov 07 10:48:15 2011 +0100
    22.3 @@ -2,5 +2,6 @@
    22.4  " ddd ".toS|
    22.5  (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
    22.6  ------------------------------------
    22.7 +METHOD     toSet()                                    Set
    22.8  METHOD     toShort()                                  Short
    22.9  METHOD     toString()                      [PUBLIC]   String
    23.1 --- a/groovy.editor/test/unit/data/testfiles/completion/access/Access1.groovy.testBasicAccessLevels1.completion	Mon Nov 07 09:55:19 2011 +0100
    23.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/access/Access1.groovy.testBasicAccessLevels1.completion	Mon Nov 07 10:48:15 2011 +0100
    23.3 @@ -5,6 +5,7 @@
    23.4  METHOD     addShutdownHook(Closure)                   void
    23.5  METHOD     any()                                      boolean
    23.6  METHOD     any(Closure)                               boolean
    23.7 +METHOD     asBoolean()                                boolean
    23.8  METHOD     asType(Class)                              Object
    23.9  METHOD     clone()                         [PROTECTE  Object
   23.10  METHOD     collect(Closure)                           List
   23.11 @@ -16,7 +17,9 @@
   23.12  METHOD     every()                                    boolean
   23.13  METHOD     every(Closure)                             boolean
   23.14  METHOD     finalize()                      [PROTECTE  void
   23.15 +METHOD     find()                                     Object
   23.16  METHOD     find(Closure)                              Object
   23.17 +METHOD     findAll()                                  Collection
   23.18  METHOD     findAll(Closure)                           Collection
   23.19  METHOD     findIndexOf(Closure)                       int
   23.20  METHOD     findIndexOf(int, Closure)                  int
   23.21 @@ -24,12 +27,15 @@
   23.22  METHOD     findIndexValues(Number, Closur             List
   23.23  METHOD     findLastIndexOf(Closure)                   int
   23.24  METHOD     findLastIndexOf(int, Closure)              int
   23.25 +METHOD     findResult(Closure)                        Object
   23.26 +METHOD     findResult(Object, Closure)                Object
   23.27  METHOD     getAt(String)                              Object
   23.28 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
   23.29 +METHOD     getClass()                      [PUBLIC]   Class<?>
   23.30  METHOD     getMetaClass()                             MetaClass
   23.31  METHOD     getMetaPropertyValues()                    List
   23.32  METHOD     getProperties()                            Map
   23.33  METHOD     getProperty(String)             [PUBLIC]   Object
   23.34 +METHOD     grep()                                     Collection
   23.35  METHOD     grep(Object)                               Collection
   23.36  METHOD     hasProperty(String)                        MetaProperty
   23.37  METHOD     hashCode()                      [PUBLIC]   int
    24.1 --- a/groovy.editor/test/unit/data/testfiles/completion/closures/InsideClosure1.groovy.testInsideClosure1.completion	Mon Nov 07 09:55:19 2011 +0100
    24.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/closures/InsideClosure1.groovy.testInsideClosure1.completion	Mon Nov 07 10:48:15 2011 +0100
    24.3 @@ -25,6 +25,7 @@
    24.4  CLASS      AntBuilder                                 null
    24.5  CLASS      Appendable                                 null
    24.6  CLASS      ArithmeticException                        null
    24.7 +CLASS      ArrayDeque                                 null
    24.8  CLASS      ArrayIndexOutOfBoundsException             null
    24.9  CLASS      ArrayList                                  null
   24.10  CLASS      ArrayStoreException                        null
   24.11 @@ -81,9 +82,13 @@
   24.12  CLASS      ConfigObject                               null
   24.13  CLASS      ConfigSlurper                              null
   24.14  CLASS      ConnectException                           null
   24.15 +CLASS      Console                                    null
   24.16  CLASS      ContentHandler                             null
   24.17  CLASS      ContentHandlerFactory                      null
   24.18  CLASS      CookieHandler                              null
   24.19 +CLASS      CookieManager                              null
   24.20 +CLASS      CookiePolicy                               null
   24.21 +CLASS      CookieStore                                null
   24.22  CLASS      Currency                                   null
   24.23  CLASS      DataInput                                  null
   24.24  CLASS      DataInputStream                            null
   24.25 @@ -98,6 +103,7 @@
   24.26  CLASS      DelegatingMetaClass                        null
   24.27  CLASS      Deprecated                                 null
   24.28  CLASS      DeprecationException                       null
   24.29 +CLASS      Deque                                      null
   24.30  CLASS      Dictionary                                 null
   24.31  CLASS      Double                                     null
   24.32  CLASS      DuplicateFormatFlagsException              null
   24.33 @@ -148,8 +154,12 @@
   24.34  CLASS      FormatterClosedException                   null
   24.35  CLASS      GString                                    null
   24.36  CLASS      Grab                                       null
   24.37 +CLASS      GrabConfig                                 null
   24.38 +CLASS      GrabExclude                                null
   24.39 +CLASS      GrabResolver                               null
   24.40  CLASS      Grapes                                     null
   24.41  CLASS      GregorianCalendar                          null
   24.42 +CLASS      GroovyCallable                             null
   24.43  CLASS      GroovyClassLoader                          null
   24.44  CLASS      GroovyCodeSource                           null
   24.45  CLASS      GroovyCollections                          null
   24.46 @@ -170,9 +180,12 @@
   24.47  CLASS      HashMap                                    null
   24.48  CLASS      HashSet                                    null
   24.49  CLASS      Hashtable                                  null
   24.50 +CLASS      HttpCookie                                 null
   24.51  CLASS      HttpRetryException                         null
   24.52  CLASS      HttpURLConnection                          null
   24.53 +CLASS      IDN                                        null
   24.54  CLASS      IFileNameFinder                            null
   24.55 +CLASS      IOError                                    null
   24.56  CLASS      IOException                                null
   24.57  CLASS      IdentityHashMap                            null
   24.58  CLASS      IllegalAccessError                         null
   24.59 @@ -207,6 +220,7 @@
   24.60  CLASS      IntRange                                   null
   24.61  CLASS      Integer                                    null
   24.62  CLASS      Interceptor                                null
   24.63 +CLASS      InterfaceAddress                           null
   24.64  CLASS      InternalError                              null
   24.65  CLASS      InterruptedException                       null
   24.66  CLASS      InterruptedIOException                     null
   24.67 @@ -216,6 +230,8 @@
   24.68  CLASS      Iterable                                   null
   24.69  CLASS      Iterator                                   null
   24.70  CLASS      JarURLConnection                           null
   24.71 +CLASS      JavadocAssertionTestBuilder                null
   24.72 +CLASS      JavadocAssertionTestSuite                  null
   24.73  CLASS      Lazy                                       null
   24.74  CLASS      LineNumberInputStream                      null
   24.75  CLASS      LineNumberReader                           null
   24.76 @@ -231,6 +247,7 @@
   24.77  CLASS      MalformedURLException                      null
   24.78  CLASS      Map                                        null
   24.79  CLASS      MapEntry                                   null
   24.80 +CLASS      MapWithDefault                             null
   24.81  CLASS      Math                                       null
   24.82  CLASS      MetaArrayLengthProperty                    null
   24.83  CLASS      MetaBeanProperty                           null
   24.84 @@ -253,6 +270,8 @@
   24.85  CLASS      Mixin                                      null
   24.86  CLASS      MulticastSocket                            null
   24.87  CLASS      MutableMetaClass                           null
   24.88 +CLASS      NavigableMap                               null
   24.89 +CLASS      NavigableSet                               null
   24.90  CLASS      NegativeArraySizeException                 null
   24.91  CLASS      NetPermission                              null
   24.92  CLASS      NetworkInterface                           null
   24.93 @@ -301,6 +320,7 @@
   24.94  CLASS      PackageScope                               null
   24.95  CLASS      ParameterArray                             null
   24.96  CLASS      PasswordAuthentication                     null
   24.97 +CLASS      PermutationGenerator                       null
   24.98  CLASS      PipedInputStream                           null
   24.99  CLASS      PipedOutputStream                          null
  24.100  CLASS      PipedReader                                null
  24.101 @@ -352,6 +372,8 @@
  24.102  CLASS      Serializable                               null
  24.103  CLASS      SerializablePermission                     null
  24.104  CLASS      ServerSocket                               null
  24.105 +CLASS      ServiceConfigurationError                  null
  24.106 +CLASS      ServiceLoader                              null
  24.107  CLASS      Set                                        null
  24.108  CLASS      Short                                      null
  24.109  CLASS      SimpleTimeZone                             null
    25.1 --- a/groovy.editor/test/unit/data/testfiles/completion/closures/InsideClosure1.groovy.testInsideClosure2.completion	Mon Nov 07 09:55:19 2011 +0100
    25.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/closures/InsideClosure1.groovy.testInsideClosure2.completion	Mon Nov 07 10:48:15 2011 +0100
    25.3 @@ -2,7 +2,9 @@
    25.4  [3,4,5].each {println i|}
    25.5  (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
    25.6  ------------------------------------
    25.7 +CLASS      IDN                                        null
    25.8  CLASS      IFileNameFinder                            null
    25.9 +CLASS      IOError                                    null
   25.10  CLASS      IOException                                null
   25.11  CLASS      IdentityHashMap                            null
   25.12  CLASS      IllegalAccessError                         null
   25.13 @@ -37,6 +39,7 @@
   25.14  CLASS      IntRange                                   null
   25.15  CLASS      Integer                                    null
   25.16  CLASS      Interceptor                                null
   25.17 +CLASS      InterfaceAddress                           null
   25.18  CLASS      InternalError                              null
   25.19  CLASS      InterruptedException                       null
   25.20  CLASS      InterruptedIOException                     null
    26.1 --- a/groovy.editor/test/unit/data/testfiles/completion/closures/InsideClosure1.groovy.testInsideClosure3.completion	Mon Nov 07 09:55:19 2011 +0100
    26.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/closures/InsideClosure1.groovy.testInsideClosure3.completion	Mon Nov 07 10:48:15 2011 +0100
    26.3 @@ -15,6 +15,7 @@
    26.4  CLASS      AntBuilder                                 null
    26.5  CLASS      Appendable                                 null
    26.6  CLASS      ArithmeticException                        null
    26.7 +CLASS      ArrayDeque                                 null
    26.8  CLASS      ArrayIndexOutOfBoundsException             null
    26.9  CLASS      ArrayList                                  null
   26.10  CLASS      ArrayStoreException                        null
    27.1 --- a/groovy.editor/test/unit/data/testfiles/completion/closures/InsideClosure1.groovy.testInsideClosure5.completion	Mon Nov 07 09:55:19 2011 +0100
    27.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/closures/InsideClosure1.groovy.testInsideClosure5.completion	Mon Nov 07 10:48:15 2011 +0100
    27.3 @@ -2,7 +2,9 @@
    27.4  def t1 = {println i|}
    27.5  (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
    27.6  ------------------------------------
    27.7 +CLASS      IDN                                        null
    27.8  CLASS      IFileNameFinder                            null
    27.9 +CLASS      IOError                                    null
   27.10  CLASS      IOException                                null
   27.11  CLASS      IdentityHashMap                            null
   27.12  CLASS      IllegalAccessError                         null
   27.13 @@ -37,6 +39,7 @@
   27.14  CLASS      IntRange                                   null
   27.15  CLASS      Integer                                    null
   27.16  CLASS      Interceptor                                null
   27.17 +CLASS      InterfaceAddress                           null
   27.18  CLASS      InternalError                              null
   27.19  CLASS      InterruptedException                       null
   27.20  CLASS      InterruptedIOException                     null
    28.1 --- a/groovy.editor/test/unit/data/testfiles/completion/closures/InsideClosure1.groovy.testInsideClosure7.completion	Mon Nov 07 09:55:19 2011 +0100
    28.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/closures/InsideClosure1.groovy.testInsideClosure7.completion	Mon Nov 07 10:48:15 2011 +0100
    28.3 @@ -2,7 +2,9 @@
    28.4  "TestString".eachLine {String line -> println i|}
    28.5  (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
    28.6  ------------------------------------
    28.7 +CLASS      IDN                                        null
    28.8  CLASS      IFileNameFinder                            null
    28.9 +CLASS      IOError                                    null
   28.10  CLASS      IOException                                null
   28.11  CLASS      IdentityHashMap                            null
   28.12  CLASS      IllegalAccessError                         null
   28.13 @@ -37,6 +39,7 @@
   28.14  CLASS      IntRange                                   null
   28.15  CLASS      Integer                                    null
   28.16  CLASS      Interceptor                                null
   28.17 +CLASS      InterfaceAddress                           null
   28.18  CLASS      InternalError                              null
   28.19  CLASS      InterruptedException                       null
   28.20  CLASS      InterruptedIOException                     null
    29.1 --- a/groovy.editor/test/unit/data/testfiles/completion/collections/Collections1.groovy.testCollections3.completion	Mon Nov 07 09:55:19 2011 +0100
    29.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/collections/Collections1.groovy.testCollections3.completion	Mon Nov 07 10:48:15 2011 +0100
    29.3 @@ -5,10 +5,13 @@
    29.4  METHOD     add(E)                          [PUBLIC]   boolean
    29.5  METHOD     add(int, E)                     [PUBLIC]   void
    29.6  METHOD     addAll(Collection<? extends E>  [PUBLIC]   boolean
    29.7 +METHOD     addAll(Object[])                           boolean
    29.8  METHOD     addAll(int, Collection<? exten  [PUBLIC]   boolean
    29.9 +METHOD     addAll(int, Object)                        boolean
   29.10  METHOD     addShutdownHook(Closure)                   void
   29.11  METHOD     any()                                      boolean
   29.12  METHOD     any(Closure)                               boolean
   29.13 +METHOD     asBoolean()                                boolean
   29.14  METHOD     asImmutable()                              List
   29.15  METHOD     asList()                                   List
   29.16  METHOD     asSynchronized()                           List
    30.1 --- a/groovy.editor/test/unit/data/testfiles/completion/collections/Collections1.groovy.testCollections5.completion	Mon Nov 07 09:55:19 2011 +0100
    30.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/collections/Collections1.groovy.testCollections5.completion	Mon Nov 07 10:48:15 2011 +0100
    30.3 @@ -5,10 +5,13 @@
    30.4  METHOD     add(E)                          [PUBLIC]   boolean
    30.5  METHOD     add(int, E)                     [PUBLIC]   void
    30.6  METHOD     addAll(Collection<? extends E>  [PUBLIC]   boolean
    30.7 +METHOD     addAll(Object[])                           boolean
    30.8  METHOD     addAll(int, Collection<? exten  [PUBLIC]   boolean
    30.9 +METHOD     addAll(int, Object)                        boolean
   30.10  METHOD     addShutdownHook(Closure)                   void
   30.11  METHOD     any()                                      boolean
   30.12  METHOD     any(Closure)                               boolean
   30.13 +METHOD     asBoolean()                                boolean
   30.14  METHOD     asImmutable()                              List
   30.15  METHOD     asList()                                   List
   30.16  METHOD     asSynchronized()                           List
   30.17 @@ -18,14 +21,24 @@
   30.18  METHOD     collect(Collection, Closure)               Collection
   30.19  METHOD     collectAll(Closure)                        List
   30.20  METHOD     collectAll(Collection, Closure             Collection
   30.21 +METHOD     collectEntries(Closure)                    Map
   30.22 +METHOD     collectEntries(Map, Closure)               Map
   30.23 +METHOD     collectMany(Closure)                       Collection
   30.24 +METHOD     collectNested(Closure)                     List
   30.25 +METHOD     collectNested(Collection, Clos             Collection
   30.26  METHOD     combinations()                             List
   30.27  METHOD     contains(Object)                [PUBLIC]   boolean
   30.28  METHOD     containsAll(Collection<?>)      [PUBLIC]   boolean
   30.29 +METHOD     containsAll(Object[])                      boolean
   30.30  METHOD     containsWithinBounds(Object)    [PUBLIC]   boolean
   30.31 +METHOD     count(Closure)                             Number
   30.32  METHOD     count(Object)                              Number
   30.33 +METHOD     countBy(Closure)                           Map
   30.34  METHOD     disjoint(Collection)                       boolean
   30.35 +METHOD     drop(int)                                  List
   30.36  METHOD     dump()                                     String
   30.37  METHOD     each(Closure)                              Object
   30.38 +METHOD     eachPermutation(Closure)                   Iterator
   30.39  METHOD     eachWithIndex(Closure)                     Object
   30.40  METHOD     equals(List)                               boolean
   30.41  METHOD     equals(Object)                  [PUBLIC]   boolean
   30.42 @@ -33,7 +46,11 @@
   30.43  METHOD     every()                                    boolean
   30.44  METHOD     every(Closure)                             boolean
   30.45  METHOD     execute()                                  Process
   30.46 +METHOD     execute(List, File)                        Process
   30.47 +METHOD     execute(String[], File)                    Process
   30.48 +METHOD     find()                                     Object
   30.49  METHOD     find(Closure)                              Object
   30.50 +METHOD     findAll()                                  Collection
   30.51  METHOD     findAll(Closure)                           Collection
   30.52  METHOD     findIndexOf(Closure)                       int
   30.53  METHOD     findIndexOf(int, Closure)                  int
   30.54 @@ -41,22 +58,29 @@
   30.55  METHOD     findIndexValues(Number, Closur             List
   30.56  METHOD     findLastIndexOf(Closure)                   int
   30.57  METHOD     findLastIndexOf(int, Closure)              int
   30.58 +METHOD     findResult(Closure)                        Object
   30.59 +METHOD     findResult(Object, Closure)                Object
   30.60 +METHOD     findResults(Closure)                       Collection
   30.61  METHOD     first()                                    Object
   30.62  METHOD     flatten()                                  Collection
   30.63  METHOD     flatten(Closure)                           Collection
   30.64  METHOD     get(int)                        [PUBLIC]   E
   30.65  METHOD     getAt(Collection)                          List
   30.66 -METHOD     getAt(IntRange)                            List
   30.67 +METHOD     getAt(EmptyRange)                          List
   30.68 +METHOD     getAt(Range)                               List
   30.69  METHOD     getAt(String)                              List
   30.70  METHOD     getAt(int)                                 Object
   30.71 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
   30.72 +METHOD     getClass()                      [PUBLIC]   Class<?>
   30.73  METHOD     getFrom()                       [PUBLIC]   Comparable
   30.74  METHOD     getMetaClass()                             MetaClass
   30.75  METHOD     getMetaPropertyValues()                    List
   30.76  METHOD     getProperties()                            Map
   30.77  METHOD     getTo()                         [PUBLIC]   Comparable
   30.78 +METHOD     grep()                                     Collection
   30.79  METHOD     grep(Object)                               Collection
   30.80  METHOD     groupBy(Closure)                           Map
   30.81 +METHOD     groupBy(List)                              Map
   30.82 +METHOD     groupBy(Object[])                          Map
   30.83  METHOD     hasProperty(String)                        MetaProperty
   30.84  METHOD     hashCode()                      [PUBLIC]   int
   30.85  METHOD     head()                                     Object
   30.86 @@ -89,8 +113,11 @@
   30.87  METHOD     multiply(Number)                           List
   30.88  METHOD     notify()                        [PUBLIC]   void
   30.89  METHOD     notifyAll()                     [PUBLIC]   void
   30.90 +METHOD     permutations()                             Set
   30.91  METHOD     plus(Collection)                           Collection
   30.92  METHOD     plus(Object)                               Collection
   30.93 +METHOD     plus(int, List)                            List
   30.94 +METHOD     plus(int, Object)                          List
   30.95  METHOD     pop()                                      Object
   30.96  METHOD     print(Object)                              void
   30.97  METHOD     print(PrintWriter)                         void
   30.98 @@ -100,6 +127,7 @@
   30.99  METHOD     println(Object)                            void
  30.100  METHOD     println(PrintWriter)                       void
  30.101  METHOD     push(Object)                               boolean
  30.102 +METHOD     putAt(EmptyRange, Collection)              void
  30.103  METHOD     putAt(EmptyRange, Object)                  void
  30.104  METHOD     putAt(IntRange, Collection)                void
  30.105  METHOD     putAt(IntRange, Object)                    void
  30.106 @@ -109,11 +137,16 @@
  30.107  METHOD     putAt(int, Object)                         void
  30.108  METHOD     remove(Object)                  [PUBLIC]   boolean
  30.109  METHOD     remove(int)                     [PUBLIC]   E
  30.110 +METHOD     removeAll(Closure)                         boolean
  30.111  METHOD     removeAll(Collection<?>)        [PUBLIC]   boolean
  30.112 +METHOD     removeAll(Object[])                        boolean
  30.113  METHOD     respondsTo(String)                         List
  30.114  METHOD     respondsTo(String, Object)                 List
  30.115 +METHOD     retainAll(Closure)                         boolean
  30.116  METHOD     retainAll(Collection<?>)        [PUBLIC]   boolean
  30.117 +METHOD     retainAll(Object[])                        boolean
  30.118  METHOD     reverse()                                  List
  30.119 +METHOD     reverse(boolean)                           List
  30.120  METHOD     reverseEach(Closure)                       List
  30.121  METHOD     set(int, E)                     [PUBLIC]   E
  30.122  METHOD     setMetaClass(MetaClass)                    void
  30.123 @@ -123,26 +156,37 @@
  30.124  METHOD     sort()                                     List
  30.125  METHOD     sort(Closure)                              List
  30.126  METHOD     sort(Comparator)                           List
  30.127 +METHOD     sort(boolean)                              List
  30.128 +METHOD     sort(boolean, Closure)                     List
  30.129 +METHOD     sort(boolean, Comparator)                  List
  30.130  METHOD     split(Closure)                             Collection
  30.131  METHOD     sprintf(String, Object)                    String
  30.132  METHOD     sprintf(String, Object)                    String
  30.133 -METHOD     step(int)                       [PUBLIC]   List
  30.134 +METHOD     step(int)                       [PUBLIC]   List<T>
  30.135  METHOD     step(int, Closure)              [PUBLIC]   void
  30.136  METHOD     subList(int, int)               [PUBLIC]   List<E>
  30.137 +METHOD     subsequences()                             Set
  30.138  METHOD     sum()                                      Object
  30.139  METHOD     sum(Closure)                               Object
  30.140  METHOD     sum(Object)                                Object
  30.141  METHOD     sum(Object, Closure)                       Object
  30.142  METHOD     tail()                                     List
  30.143 +METHOD     take(int)                                  List
  30.144  METHOD     toArray()                       [PUBLIC]   Object[]
  30.145  METHOD     toArray(T[])                    [PUBLIC]   T[]
  30.146  METHOD     toList()                                   List
  30.147  METHOD     toListString()                             String
  30.148 +METHOD     toListString(int)                          String
  30.149 +METHOD     toSet()                                    Set
  30.150 +METHOD     toSpreadMap()                              SpreadMap
  30.151  METHOD     toString()                                 String
  30.152  METHOD     transpose()                                List
  30.153  METHOD     unique()                                   Collection
  30.154  METHOD     unique(Closure)                            Collection
  30.155  METHOD     unique(Comparator)                         Collection
  30.156 +METHOD     unique(boolean)                            Collection
  30.157 +METHOD     unique(boolean, Closure)                   Collection
  30.158 +METHOD     unique(boolean, Comparator)                Collection
  30.159  METHOD     use(Class, Closure)                        Object
  30.160  METHOD     use(List, Closure)                         Object
  30.161  METHOD     use(Object[])                              Object
    31.1 --- a/groovy.editor/test/unit/data/testfiles/completion/duplicates/b/B.groovy.testDuplicates1.completion	Mon Nov 07 09:55:19 2011 +0100
    31.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/duplicates/b/B.groovy.testDuplicates1.completion	Mon Nov 07 10:48:15 2011 +0100
    31.3 @@ -16,6 +16,7 @@
    31.4  CLASS      AntBuilder                                 null
    31.5  CLASS      Appendable                                 null
    31.6  CLASS      ArithmeticException                        null
    31.7 +CLASS      ArrayDeque                                 null
    31.8  CLASS      ArrayIndexOutOfBoundsException             null
    31.9  CLASS      ArrayList                                  null
   31.10  CLASS      ArrayStoreException                        null
    32.1 --- a/groovy.editor/test/unit/data/testfiles/completion/duplicates/d/D.groovy.testDuplicates3.completion	Mon Nov 07 09:55:19 2011 +0100
    32.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/duplicates/d/D.groovy.testDuplicates3.completion	Mon Nov 07 10:48:15 2011 +0100
    32.3 @@ -8,5 +8,6 @@
    32.4  CLASS      AbstractQueue                              null
    32.5  CLASS      AbstractSequentialList                     null
    32.6  CLASS      AbstractSet                                null
    32.7 +CLASS      ArrayDeque                                 null
    32.8  CLASS      ArrayList                                  null
    32.9  CLASS      Arrays                                     null
    33.1 --- a/groovy.editor/test/unit/data/testfiles/completion/grails/GrailsConfig1.groovy.testDataSourceClosure1.completion	Mon Nov 07 09:55:19 2011 +0100
    33.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/grails/GrailsConfig1.groovy.testDataSourceClosure1.completion	Mon Nov 07 10:48:15 2011 +0100
    33.3 @@ -5,22 +5,25 @@
    33.4  METHOD     addShutdownHook(Closure)                   void
    33.5  METHOD     any()                                      boolean
    33.6  METHOD     any(Closure)                               boolean
    33.7 +METHOD     asBoolean()                                boolean
    33.8  METHOD     asType(Class)                              Object
    33.9  METHOD     asWritable()                    [PUBLIC]   Closure
   33.10 -METHOD     call()                          [PUBLIC]   Object
   33.11 -METHOD     call(Object)                    [PUBLIC]   Object
   33.12 -METHOD     call(Object[])                  [PUBLIC]   Object
   33.13 +METHOD     call()                          [PUBLIC]   V
   33.14 +METHOD     call(Object)                    [PUBLIC]   V
   33.15 +METHOD     call(Object[])                  [PUBLIC]   V
   33.16  METHOD     clone()                         [PUBLIC]   Object
   33.17  METHOD     collect(Closure)                           List
   33.18  METHOD     collect(Collection, Closure)               Collection
   33.19 -METHOD     curry(Object[])                 [PUBLIC]   Closure
   33.20 +METHOD     curry(Object[])                 [PUBLIC]   Closure<V>
   33.21  METHOD     dump()                                     String
   33.22  METHOD     each(Closure)                              Object
   33.23  METHOD     eachWithIndex(Closure)                     Object
   33.24  METHOD     equals(Object)                  [PUBLIC]   boolean
   33.25  METHOD     every()                                    boolean
   33.26  METHOD     every(Closure)                             boolean
   33.27 +METHOD     find()                                     Object
   33.28  METHOD     find(Closure)                              Object
   33.29 +METHOD     findAll()                                  Collection
   33.30  METHOD     findAll(Closure)                           Collection
   33.31  METHOD     findIndexOf(Closure)                       int
   33.32  METHOD     findIndexOf(int, Closure)                  int
   33.33 @@ -28,8 +31,10 @@
   33.34  METHOD     findIndexValues(Number, Closur             List
   33.35  METHOD     findLastIndexOf(Closure)                   int
   33.36  METHOD     findLastIndexOf(int, Closure)              int
   33.37 +METHOD     findResult(Closure)                        Object
   33.38 +METHOD     findResult(Object, Closure)                Object
   33.39  METHOD     getAt(String)                              Object
   33.40 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
   33.41 +METHOD     getClass()                      [PUBLIC]   Class<?>
   33.42  METHOD     getDelegate()                   [PUBLIC]   Object
   33.43  METHOD     getDirective()                  [PUBLIC]   int
   33.44  METHOD     getMaximumNumberOfParameters()  [PUBLIC]   int
   33.45 @@ -41,6 +46,7 @@
   33.46  METHOD     getProperty(String)             [PUBLIC]   Object
   33.47  METHOD     getResolveStrategy()            [PUBLIC]   int
   33.48  METHOD     getThisObject()                 [PUBLIC]   Object
   33.49 +METHOD     grep()                                     Collection
   33.50  METHOD     grep(Object)                               Collection
   33.51  METHOD     hasProperty(String)                        MetaProperty
   33.52  METHOD     hashCode()                      [PUBLIC]   int
   33.53 @@ -51,7 +57,15 @@
   33.54  METHOD     is(Object)                                 boolean
   33.55  METHOD     isCase(Object)                  [PUBLIC]   boolean
   33.56  METHOD     iterator()                                 Iterator
   33.57 +METHOD     leftShift(Closure)              [PUBLIC]   Closure<V>
   33.58 +METHOD     leftShift(Object)               [PUBLIC]   V
   33.59 +METHOD     memoize()                       [PUBLIC]   Closure<V>
   33.60 +METHOD     memoizeAtLeast(int)             [PUBLIC]   Closure<V>
   33.61 +METHOD     memoizeAtMost(int)              [PUBLIC]   Closure<V>
   33.62 +METHOD     memoizeBetween(int, int)        [PUBLIC]   Closure<V>
   33.63  METHOD     metaClass(Closure)                         MetaClass
   33.64 +METHOD     ncurry(int, Object)             [PUBLIC]   Closure<V>
   33.65 +METHOD     ncurry(int, Object[])           [PUBLIC]   Closure<V>
   33.66  METHOD     notify()                        [PUBLIC]   void
   33.67  METHOD     notifyAll()                     [PUBLIC]   void
   33.68  METHOD     print(Object)                              void
   33.69 @@ -62,8 +76,11 @@
   33.70  METHOD     println(Object)                            void
   33.71  METHOD     println(PrintWriter)                       void
   33.72  METHOD     putAt(String, Object)                      void
   33.73 +METHOD     rcurry(Object)                  [PUBLIC]   Closure<V>
   33.74 +METHOD     rcurry(Object[])                [PUBLIC]   Closure<V>
   33.75  METHOD     respondsTo(String)                         List
   33.76  METHOD     respondsTo(String, Object)                 List
   33.77 +METHOD     rightShift(Closure<W>)          [PUBLIC]   Closure<W>
   33.78  METHOD     run()                           [PUBLIC]   void
   33.79  METHOD     setDelegate(Object)             [PUBLIC]   void
   33.80  METHOD     setDirective(int)               [PUBLIC]   void
   33.81 @@ -76,6 +93,8 @@
   33.82  METHOD     sprintf(String, Object)                    String
   33.83  METHOD     sprintf(String, Object)                    String
   33.84  METHOD     toString()                                 String
   33.85 +METHOD     trampoline()                    [PUBLIC]   Closure<V>
   33.86 +METHOD     trampoline(Object[])            [PUBLIC]   Closure<V>
   33.87  METHOD     use(Class, Closure)                        Object
   33.88  METHOD     use(List, Closure)                         Object
   33.89  METHOD     use(Object[])                              Object
   33.90 @@ -86,6 +105,7 @@
   33.91  FIELD      DELEGATE_FIRST                  [STATIC,   int
   33.92  FIELD      DELEGATE_ONLY                   [STATIC,   int
   33.93  FIELD      DONE                            [STATIC,   int
   33.94 +FIELD      IDENTITY                        [STATIC,   Closure
   33.95  FIELD      OWNER_FIRST                     [STATIC,   int
   33.96  FIELD      OWNER_ONLY                      [STATIC,   int
   33.97  FIELD      SKIP                            [STATIC,   int
    34.1 --- a/groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy.testInference1.completion	Mon Nov 07 09:55:19 2011 +0100
    34.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy.testInference1.completion	Mon Nov 07 10:48:15 2011 +0100
    34.3 @@ -4,9 +4,11 @@
    34.4  ------------------------------------
    34.5  METHOD     add(E)                          [PUBLIC]   boolean
    34.6  METHOD     addAll(Collection<? extends E>  [PUBLIC]   boolean
    34.7 +METHOD     addAll(Object[])                           boolean
    34.8  METHOD     addShutdownHook(Closure)                   void
    34.9  METHOD     any()                                      boolean
   34.10  METHOD     any(Closure)                               boolean
   34.11 +METHOD     asBoolean()                                boolean
   34.12  METHOD     asImmutable()                              Set
   34.13  METHOD     asList()                                   List
   34.14  METHOD     asSynchronized()                           Set
    35.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    35.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy.testInference2.completion	Mon Nov 07 10:48:15 2011 +0100
    35.3 @@ -0,0 +1,31 @@
    35.4 +Code completion result for source line:
    35.5 +set.t|
    35.6 +(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
    35.7 +------------------------------------
    35.8 +METHOD     take(int)                                  CharSequence
    35.9 +METHOD     toBigDecimal()                             BigDecimal
   35.10 +METHOD     toBigInteger()                             BigInteger
   35.11 +METHOD     toBoolean()                                Boolean
   35.12 +METHOD     toCharArray()                   [PUBLIC]   char[]
   35.13 +METHOD     toCharacter()                              Character
   35.14 +METHOD     toDouble()                                 Double
   35.15 +METHOD     toFloat()                                  Float
   35.16 +METHOD     toInteger()                                Integer
   35.17 +METHOD     toList()                                   List
   35.18 +METHOD     toLong()                                   Long
   35.19 +METHOD     toLowerCase()                   [PUBLIC]   String
   35.20 +METHOD     toLowerCase(Locale)             [PUBLIC]   String
   35.21 +METHOD     toSet()                                    Set
   35.22 +METHOD     toShort()                                  Short
   35.23 +METHOD     toString()                      [PUBLIC]   String
   35.24 +METHOD     toURI()                                    URI
   35.25 +METHOD     toURL()                                    URL
   35.26 +METHOD     toUpperCase()                   [PUBLIC]   String
   35.27 +METHOD     toUpperCase(Locale)             [PUBLIC]   String
   35.28 +METHOD     tokenize()                                 List
   35.29 +METHOD     tokenize(CharSequence)                     List
   35.30 +METHOD     tokenize(Character)                        List
   35.31 +METHOD     tokenize(String)                           List
   35.32 +METHOD     tr(CharSequence, CharSequence)             CharSequence
   35.33 +METHOD     tr(String, String)                         String
   35.34 +METHOD     trim()                          [PUBLIC]   String
    36.1 --- a/groovy.editor/test/unit/data/testfiles/completion/inference/Inference1.groovy.testinference2.completion	Mon Nov 07 09:55:19 2011 +0100
    36.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    36.3 @@ -1,25 +0,0 @@
    36.4 -Code completion result for source line:
    36.5 -set.t|
    36.6 -(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
    36.7 -------------------------------------
    36.8 -METHOD     toBigDecimal()                             BigDecimal
    36.9 -METHOD     toBigInteger()                             BigInteger
   36.10 -METHOD     toBoolean()                                Boolean
   36.11 -METHOD     toCharArray()                   [PUBLIC]   char[]
   36.12 -METHOD     toCharacter()                              Character
   36.13 -METHOD     toDouble()                                 Double
   36.14 -METHOD     toFloat()                                  Float
   36.15 -METHOD     toInteger()                                Integer
   36.16 -METHOD     toList()                                   List
   36.17 -METHOD     toLong()                                   Long
   36.18 -METHOD     toLowerCase()                   [PUBLIC]   String
   36.19 -METHOD     toLowerCase(Locale)             [PUBLIC]   String
   36.20 -METHOD     toShort()                                  Short
   36.21 -METHOD     toString()                      [PUBLIC]   String
   36.22 -METHOD     toURI()                                    URI
   36.23 -METHOD     toURL()                                    URL
   36.24 -METHOD     toUpperCase()                   [PUBLIC]   String
   36.25 -METHOD     toUpperCase(Locale)             [PUBLIC]   String
   36.26 -METHOD     tokenize()                                 List
   36.27 -METHOD     tokenize(String)                           List
   36.28 -METHOD     trim()                          [PUBLIC]   String
    37.1 --- a/groovy.editor/test/unit/data/testfiles/completion/method/Methods1.groovy.testMethods3.completion	Mon Nov 07 09:55:19 2011 +0100
    37.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/method/Methods1.groovy.testMethods3.completion	Mon Nov 07 10:48:15 2011 +0100
    37.3 @@ -4,7 +4,8 @@
    37.4  ------------------------------------
    37.5  METHOD     getAt(String)                              Object
    37.6  METHOD     getAuthority()                  [PUBLIC]   String
    37.7 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
    37.8 +METHOD     getBytes()                                 byte[]
    37.9 +METHOD     getClass()                      [PUBLIC]   Class<?>
   37.10  METHOD     getContent()                    [PUBLIC]   Object
   37.11  METHOD     getContent(Class[])             [PUBLIC]   Object
   37.12  METHOD     getDefaultPort()                [PUBLIC]   int
   37.13 @@ -19,5 +20,7 @@
   37.14  METHOD     getQuery()                      [PUBLIC]   String
   37.15  METHOD     getRef()                        [PUBLIC]   String
   37.16  METHOD     getText()                                  String
   37.17 +METHOD     getText(Map)                               String
   37.18 +METHOD     getText(Map, String)                       String
   37.19  METHOD     getText(String)                            String
   37.20  METHOD     getUserInfo()                   [PUBLIC]   String
    38.1 --- a/groovy.editor/test/unit/data/testfiles/completion/method/Methods1.groovy.testMethods4.completion	Mon Nov 07 09:55:19 2011 +0100
    38.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/method/Methods1.groovy.testMethods4.completion	Mon Nov 07 10:48:15 2011 +0100
    38.3 @@ -5,12 +5,14 @@
    38.4  METHOD     addShutdownHook(Closure)                   void
    38.5  METHOD     any()                                      boolean
    38.6  METHOD     any(Closure)                               boolean
    38.7 +METHOD     asBoolean()                                boolean
    38.8  METHOD     asType(Class)                              Object
    38.9  METHOD     collect(Closure)                           List
   38.10  METHOD     collect(Collection, Closure)               Collection
   38.11  METHOD     dump()                                     String
   38.12  METHOD     each(Closure)                              Object
   38.13  METHOD     eachByte(Closure)                          void
   38.14 +METHOD     eachByte(int, Closure)                     void
   38.15  METHOD     eachLine(Closure)                          Object
   38.16  METHOD     eachLine(String,  int, Closure             Object
   38.17  METHOD     eachLine(String, Closure)                  Object
   38.18 @@ -19,7 +21,13 @@
   38.19  METHOD     equals(Object)                  [PUBLIC]   boolean
   38.20  METHOD     every()                                    boolean
   38.21  METHOD     every(Closure)                             boolean
   38.22 +METHOD     filterLine(Closure)                        Writable
   38.23 +METHOD     filterLine(String, Closure)                Writable
   38.24 +METHOD     filterLine(Writer, Closure)                void
   38.25 +METHOD     filterLine(Writer, String, Clo             void
   38.26 +METHOD     find()                                     Object
   38.27  METHOD     find(Closure)                              Object
   38.28 +METHOD     findAll()                                  Collection
   38.29  METHOD     findAll(Closure)                           Collection
   38.30  METHOD     findIndexOf(Closure)                       int
   38.31  METHOD     findIndexOf(int, Closure)                  int
   38.32 @@ -27,9 +35,12 @@
   38.33  METHOD     findIndexValues(Number, Closur             List
   38.34  METHOD     findLastIndexOf(Closure)                   int
   38.35  METHOD     findLastIndexOf(int, Closure)              int
   38.36 +METHOD     findResult(Closure)                        Object
   38.37 +METHOD     findResult(Object, Closure)                Object
   38.38  METHOD     getAt(String)                              Object
   38.39  METHOD     getAuthority()                  [PUBLIC]   String
   38.40 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
   38.41 +METHOD     getBytes()                                 byte[]
   38.42 +METHOD     getClass()                      [PUBLIC]   Class<?>
   38.43  METHOD     getContent()                    [PUBLIC]   Object
   38.44  METHOD     getContent(Class[])             [PUBLIC]   Object
   38.45  METHOD     getDefaultPort()                [PUBLIC]   int
   38.46 @@ -44,8 +55,11 @@
   38.47  METHOD     getQuery()                      [PUBLIC]   String
   38.48  METHOD     getRef()                        [PUBLIC]   String
   38.49  METHOD     getText()                                  String
   38.50 +METHOD     getText(Map)                               String
   38.51 +METHOD     getText(Map, String)                       String
   38.52  METHOD     getText(String)                            String
   38.53  METHOD     getUserInfo()                   [PUBLIC]   String
   38.54 +METHOD     grep()                                     Collection
   38.55  METHOD     grep(Object)                               Collection
   38.56  METHOD     hasProperty(String)                        MetaProperty
   38.57  METHOD     hashCode()                      [PUBLIC]   int
   38.58 @@ -58,7 +72,10 @@
   38.59  METHOD     iterator()                                 Iterator
   38.60  METHOD     metaClass(Closure)                         MetaClass
   38.61  METHOD     newInputStream()                           BufferedInputStream
   38.62 +METHOD     newInputStream(Map)                        BufferedInputStream
   38.63  METHOD     newReader()                                BufferedReader
   38.64 +METHOD     newReader(Map)                             BufferedReader
   38.65 +METHOD     newReader(Map, String)                     BufferedReader
   38.66  METHOD     newReader(String)                          BufferedReader
   38.67  METHOD     notify()                        [PUBLIC]   void
   38.68  METHOD     notifyAll()                     [PUBLIC]   void
   38.69 @@ -73,6 +90,8 @@
   38.70  METHOD     println(Object)                            void
   38.71  METHOD     println(PrintWriter)                       void
   38.72  METHOD     putAt(String, Object)                      void
   38.73 +METHOD     readLines()                                List
   38.74 +METHOD     readLines(String)                          List
   38.75  METHOD     respondsTo(String)                         List
   38.76  METHOD     respondsTo(String, Object)                 List
   38.77  METHOD     sameFile(URL)                   [PUBLIC]   boolean
   38.78 @@ -81,6 +100,10 @@
   38.79  METHOD     sleep(long)                                void
   38.80  METHOD     sleep(long, Closure)                       void
   38.81  METHOD     split(Closure)                             Collection
   38.82 +METHOD     splitEachLine(Pattern, Closure             Object
   38.83 +METHOD     splitEachLine(Pattern, String,             Object
   38.84 +METHOD     splitEachLine(String, Closure)             Object
   38.85 +METHOD     splitEachLine(String, String,              Object
   38.86  METHOD     sprintf(String, Object)                    String
   38.87  METHOD     sprintf(String, Object)                    String
   38.88  METHOD     toExternalForm()                [PUBLIC]   String
    39.1 --- a/groovy.editor/test/unit/data/testfiles/completion/method/Methods10.groovy.testCompletionNoPrefixString1.completion	Mon Nov 07 09:55:19 2011 +0100
    39.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/method/Methods10.groovy.testCompletionNoPrefixString1.completion	Mon Nov 07 10:48:15 2011 +0100
    39.3 @@ -5,9 +5,12 @@
    39.4  METHOD     addShutdownHook(Closure)                   void
    39.5  METHOD     any()                                      boolean
    39.6  METHOD     any(Closure)                               boolean
    39.7 +METHOD     asBoolean()                                boolean
    39.8  METHOD     asType(Class)                              Object
    39.9  METHOD     bitwiseNegate()                            Pattern
   39.10 +METHOD     capitalize()                               String
   39.11  METHOD     center(Number)                             String
   39.12 +METHOD     center(Number, CharSequence)               CharSequence
   39.13  METHOD     center(Number, String)                     String
   39.14  METHOD     charAt(int)                     [PUBLIC]   char
   39.15  METHOD     codePointAt(int)                [PUBLIC]   int
   39.16 @@ -16,6 +19,7 @@
   39.17  METHOD     collect(Closure)                           List
   39.18  METHOD     collect(Collection, Closure)               Collection
   39.19  METHOD     compareTo(String)               [PUBLIC]   int
   39.20 +METHOD     compareTo(T)                    [PUBLIC]   int
   39.21  METHOD     compareToIgnoreCase(String)     [PUBLIC]   int
   39.22  METHOD     concat(String)                  [PUBLIC]   String
   39.23  METHOD     contains(CharSequence)          [PUBLIC]   boolean
   39.24 @@ -24,13 +28,16 @@
   39.25  METHOD     contentEquals(StringBuffer)     [PUBLIC]   boolean
   39.26  METHOD     copyValueOf(char[])             [STATIC,   String
   39.27  METHOD     copyValueOf(char[], int, int)   [STATIC,   String
   39.28 +METHOD     count(CharSequence)                        int
   39.29  METHOD     count(String)                              int
   39.30  METHOD     decodeBase64()                             byte[]
   39.31  METHOD     denormalize()                              String
   39.32 +METHOD     drop(int)                                  CharSequence
   39.33  METHOD     dump()                                     String
   39.34  METHOD     each(Closure)                              Object
   39.35  METHOD     eachLine(Closure)                          Object
   39.36  METHOD     eachLine(int, Closure)                     Object
   39.37 +METHOD     eachMatch(CharSequence, Closur             String
   39.38  METHOD     eachMatch(Pattern, Closure)                String
   39.39  METHOD     eachMatch(String, Closure)                 String
   39.40  METHOD     eachWithIndex(Closure)                     Object
   39.41 @@ -42,11 +49,20 @@
   39.42  METHOD     execute()                                  Process
   39.43  METHOD     execute(List, File)                        Process
   39.44  METHOD     execute(String[], File)                    Process
   39.45 +METHOD     expand()                                   String
   39.46 +METHOD     expand(int)                                String
   39.47 +METHOD     expandLine(int)                            String
   39.48 +METHOD     find()                                     Object
   39.49 +METHOD     find(CharSequence)                         CharSequence
   39.50 +METHOD     find(CharSequence, Closure)                CharSequence
   39.51  METHOD     find(Closure)                              Object
   39.52  METHOD     find(Pattern)                              String
   39.53  METHOD     find(Pattern, Closure)                     String
   39.54  METHOD     find(String)                               String
   39.55  METHOD     find(String, Closure)                      String
   39.56 +METHOD     findAll()                                  Collection
   39.57 +METHOD     findAll(CharSequence)                      List
   39.58 +METHOD     findAll(CharSequence, Closure)             List
   39.59  METHOD     findAll(Closure)                           Collection
   39.60  METHOD     findAll(Pattern)                           List
   39.61  METHOD     findAll(Pattern, Closure)                  List
   39.62 @@ -58,6 +74,8 @@
   39.63  METHOD     findIndexValues(Number, Closur             List
   39.64  METHOD     findLastIndexOf(Closure)                   int
   39.65  METHOD     findLastIndexOf(int, Closure)              int
   39.66 +METHOD     findResult(Closure)                        Object
   39.67 +METHOD     findResult(Object, Closure)                Object
   39.68  METHOD     format(Locale, String, Object[  [STATIC,   String
   39.69  METHOD     format(String, Object[])        [STATIC,   String
   39.70  METHOD     getAt(Collection)                          String
   39.71 @@ -67,14 +85,16 @@
   39.72  METHOD     getAt(String)                              Object
   39.73  METHOD     getAt(int)                                 String
   39.74  METHOD     getBytes()                      [PUBLIC]   byte[]
   39.75 +METHOD     getBytes(Charset)               [PUBLIC]   byte[]
   39.76  METHOD     getBytes(String)                [PUBLIC]   byte[]
   39.77  METHOD     getBytes(int, int, byte[], int  [PUBLIC]   void
   39.78  METHOD     getChars()                                 char[]
   39.79  METHOD     getChars(int, int, char[], int  [PUBLIC]   void
   39.80 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
   39.81 +METHOD     getClass()                      [PUBLIC]   Class<?>
   39.82  METHOD     getMetaClass()                             MetaClass
   39.83  METHOD     getMetaPropertyValues()                    List
   39.84  METHOD     getProperties()                            Map
   39.85 +METHOD     grep()                                     Collection
   39.86  METHOD     grep(Object)                               Collection
   39.87  METHOD     hasProperty(String)                        MetaProperty
   39.88  METHOD     hashCode()                      [PUBLIC]   int
   39.89 @@ -88,10 +108,12 @@
   39.90  METHOD     intern()                        [PUBLIC]   String
   39.91  METHOD     invokeMethod(String, Object)               Object
   39.92  METHOD     is(Object)                                 boolean
   39.93 +METHOD     isAllWhitespace()                          boolean
   39.94  METHOD     isBigDecimal()                             boolean
   39.95  METHOD     isBigInteger()                             boolean
   39.96  METHOD     isCase(Object)                             boolean
   39.97  METHOD     isDouble()                                 boolean
   39.98 +METHOD     isEmpty()                       [PUBLIC]   boolean
   39.99  METHOD     isFloat()                                  boolean
  39.100  METHOD     isInteger()                                boolean
  39.101  METHOD     isLong()                                   boolean
  39.102 @@ -115,8 +137,10 @@
  39.103  METHOD     numberAwareCompareTo(Comparabl             int
  39.104  METHOD     offsetByCodePoints(int, int)    [PUBLIC]   int
  39.105  METHOD     padLeft(Number)                            String
  39.106 +METHOD     padLeft(Number, CharSequence)              CharSequence
  39.107  METHOD     padLeft(Number, String)                    String
  39.108  METHOD     padRight(Number)                           String
  39.109 +METHOD     padRight(Number, CharSequence)             CharSequence
  39.110  METHOD     padRight(Number, String)                   String
  39.111  METHOD     plus(Object)                               String
  39.112  METHOD     previous()                                 String
  39.113 @@ -133,10 +157,19 @@
  39.114  METHOD     regionMatches(int, String, int  [PUBLIC]   boolean
  39.115  METHOD     replace(CharSequence, CharSequ  [PUBLIC]   String
  39.116  METHOD     replace(char, char)             [PUBLIC]   String
  39.117 +METHOD     replaceAll(CharSequence, CharS             CharSequence
  39.118 +METHOD     replaceAll(CharSequence, Closu             CharSequence
  39.119 +METHOD     replaceAll(Pattern, CharSequen             CharSequence
  39.120 +METHOD     replaceAll(Pattern, Closure)               String
  39.121  METHOD     replaceAll(Pattern, String)                String
  39.122  METHOD     replaceAll(String, Closure)                String
  39.123  METHOD     replaceAll(String, String)      [PUBLIC]   String
  39.124 +METHOD     replaceFirst(CharSequence, Cha             String
  39.125 +METHOD     replaceFirst(CharSequence, Clo             String
  39.126 +METHOD     replaceFirst(Pattern, CharSequ             CharSequence
  39.127 +METHOD     replaceFirst(Pattern, Closure)             String
  39.128  METHOD     replaceFirst(Pattern, String)              String
  39.129 +METHOD     replaceFirst(String, Closure)              String
  39.130  METHOD     replaceFirst(String, String)    [PUBLIC]   String
  39.131  METHOD     respondsTo(String)                         List
  39.132  METHOD     respondsTo(String, Object)                 List
  39.133 @@ -149,14 +182,23 @@
  39.134  METHOD     split(Closure)                             Collection
  39.135  METHOD     split(String)                   [PUBLIC]   String[]
  39.136  METHOD     split(String, int)              [PUBLIC]   String[]
  39.137 +METHOD     splitEachLine(CharSequence, Cl             Object
  39.138 +METHOD     splitEachLine(Pattern, Closure             Object
  39.139  METHOD     splitEachLine(String, Closure)             Object
  39.140  METHOD     sprintf(String, Object)                    String
  39.141  METHOD     sprintf(String, Object)                    String
  39.142  METHOD     startsWith(String)              [PUBLIC]   boolean
  39.143  METHOD     startsWith(String, int)         [PUBLIC]   boolean
  39.144 +METHOD     stripIndent()                              String
  39.145 +METHOD     stripIndent(int)                           String
  39.146 +METHOD     stripMargin()                              String
  39.147 +METHOD     stripMargin(CharSequence)                  String
  39.148 +METHOD     stripMargin(String)                        String
  39.149 +METHOD     stripMargin(char)                          String
  39.150  METHOD     subSequence(int, int)           [PUBLIC]   CharSequence
  39.151  METHOD     substring(int)                  [PUBLIC]   String
  39.152  METHOD     substring(int, int)             [PUBLIC]   String
  39.153 +METHOD     take(int)                                  CharSequence
  39.154  METHOD     toBigDecimal()                             BigDecimal
  39.155  METHOD     toBigInteger()                             BigInteger
  39.156  METHOD     toBoolean()                                Boolean
  39.157 @@ -169,6 +211,7 @@
  39.158  METHOD     toLong()                                   Long
  39.159  METHOD     toLowerCase()                   [PUBLIC]   String
  39.160  METHOD     toLowerCase(Locale)             [PUBLIC]   String
  39.161 +METHOD     toSet()                                    Set
  39.162  METHOD     toShort()                                  Short
  39.163  METHOD     toString()                      [PUBLIC]   String
  39.164  METHOD     toURI()                                    URI
  39.165 @@ -176,8 +219,15 @@
  39.166  METHOD     toUpperCase()                   [PUBLIC]   String
  39.167  METHOD     toUpperCase(Locale)             [PUBLIC]   String
  39.168  METHOD     tokenize()                                 List
  39.169 +METHOD     tokenize(CharSequence)                     List
  39.170 +METHOD     tokenize(Character)                        List
  39.171  METHOD     tokenize(String)                           List
  39.172 +METHOD     tr(CharSequence, CharSequence)             CharSequence
  39.173 +METHOD     tr(String, String)                         String
  39.174  METHOD     trim()                          [PUBLIC]   String
  39.175 +METHOD     unexpand()                                 String
  39.176 +METHOD     unexpand(int)                              String
  39.177 +METHOD     unexpandLine(int)                          String
  39.178  METHOD     use(Class, Closure)                        Object
  39.179  METHOD     use(List, Closure)                         Object
  39.180  METHOD     use(Object[])                              Object
  39.181 @@ -197,3 +247,4 @@
  39.182  FIELD      CASE_INSENSITIVE_ORDER          [STATIC,   Comparator<String>
  39.183  FIELD      bytes                                      byte[]
  39.184  FIELD      class                                      Class
  39.185 +FIELD      empty                                      boolean
    40.1 --- a/groovy.editor/test/unit/data/testfiles/completion/method/Methods11.groovy.testCompletionNoPrefixString2.completion	Mon Nov 07 09:55:19 2011 +0100
    40.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/method/Methods11.groovy.testCompletionNoPrefixString2.completion	Mon Nov 07 10:48:15 2011 +0100
    40.3 @@ -5,9 +5,12 @@
    40.4  METHOD     addShutdownHook(Closure)                   void
    40.5  METHOD     any()                                      boolean
    40.6  METHOD     any(Closure)                               boolean
    40.7 +METHOD     asBoolean()                                boolean
    40.8  METHOD     asType(Class)                              Object
    40.9  METHOD     bitwiseNegate()                            Pattern
   40.10 +METHOD     capitalize()                               String
   40.11  METHOD     center(Number)                             String
   40.12 +METHOD     center(Number, CharSequence)               CharSequence
   40.13  METHOD     center(Number, String)                     String
   40.14  METHOD     charAt(int)                     [PUBLIC]   char
   40.15  METHOD     codePointAt(int)                [PUBLIC]   int
   40.16 @@ -16,6 +19,7 @@
   40.17  METHOD     collect(Closure)                           List
   40.18  METHOD     collect(Collection, Closure)               Collection
   40.19  METHOD     compareTo(String)               [PUBLIC]   int
   40.20 +METHOD     compareTo(T)                    [PUBLIC]   int
   40.21  METHOD     compareToIgnoreCase(String)     [PUBLIC]   int
   40.22  METHOD     concat(String)                  [PUBLIC]   String
   40.23  METHOD     contains(CharSequence)          [PUBLIC]   boolean
   40.24 @@ -24,13 +28,16 @@
   40.25  METHOD     contentEquals(StringBuffer)     [PUBLIC]   boolean
   40.26  METHOD     copyValueOf(char[])             [STATIC,   String
   40.27  METHOD     copyValueOf(char[], int, int)   [STATIC,   String
   40.28 +METHOD     count(CharSequence)                        int
   40.29  METHOD     count(String)                              int
   40.30  METHOD     decodeBase64()                             byte[]
   40.31  METHOD     denormalize()                              String
   40.32 +METHOD     drop(int)                                  CharSequence
   40.33  METHOD     dump()                                     String
   40.34  METHOD     each(Closure)                              Object
   40.35  METHOD     eachLine(Closure)                          Object
   40.36  METHOD     eachLine(int, Closure)                     Object
   40.37 +METHOD     eachMatch(CharSequence, Closur             String
   40.38  METHOD     eachMatch(Pattern, Closure)                String
   40.39  METHOD     eachMatch(String, Closure)                 String
   40.40  METHOD     eachWithIndex(Closure)                     Object
   40.41 @@ -42,11 +49,20 @@
   40.42  METHOD     execute()                                  Process
   40.43  METHOD     execute(List, File)                        Process
   40.44  METHOD     execute(String[], File)                    Process
   40.45 +METHOD     expand()                                   String
   40.46 +METHOD     expand(int)                                String
   40.47 +METHOD     expandLine(int)                            String
   40.48 +METHOD     find()                                     Object
   40.49 +METHOD     find(CharSequence)                         CharSequence
   40.50 +METHOD     find(CharSequence, Closure)                CharSequence
   40.51  METHOD     find(Closure)                              Object
   40.52  METHOD     find(Pattern)                              String
   40.53  METHOD     find(Pattern, Closure)                     String
   40.54  METHOD     find(String)                               String
   40.55  METHOD     find(String, Closure)                      String
   40.56 +METHOD     findAll()                                  Collection
   40.57 +METHOD     findAll(CharSequence)                      List
   40.58 +METHOD     findAll(CharSequence, Closure)             List
   40.59  METHOD     findAll(Closure)                           Collection
   40.60  METHOD     findAll(Pattern)                           List
   40.61  METHOD     findAll(Pattern, Closure)                  List
   40.62 @@ -58,6 +74,8 @@
   40.63  METHOD     findIndexValues(Number, Closur             List
   40.64  METHOD     findLastIndexOf(Closure)                   int
   40.65  METHOD     findLastIndexOf(int, Closure)              int
   40.66 +METHOD     findResult(Closure)                        Object
   40.67 +METHOD     findResult(Object, Closure)                Object
   40.68  METHOD     format(Locale, String, Object[  [STATIC,   String
   40.69  METHOD     format(String, Object[])        [STATIC,   String
   40.70  METHOD     getAt(Collection)                          String
   40.71 @@ -67,14 +85,16 @@
   40.72  METHOD     getAt(String)                              Object
   40.73  METHOD     getAt(int)                                 String
   40.74  METHOD     getBytes()                      [PUBLIC]   byte[]
   40.75 +METHOD     getBytes(Charset)               [PUBLIC]   byte[]
   40.76  METHOD     getBytes(String)                [PUBLIC]   byte[]
   40.77  METHOD     getBytes(int, int, byte[], int  [PUBLIC]   void
   40.78  METHOD     getChars()                                 char[]
   40.79  METHOD     getChars(int, int, char[], int  [PUBLIC]   void
   40.80 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
   40.81 +METHOD     getClass()                      [PUBLIC]   Class<?>
   40.82  METHOD     getMetaClass()                             MetaClass
   40.83  METHOD     getMetaPropertyValues()                    List
   40.84  METHOD     getProperties()                            Map
   40.85 +METHOD     grep()                                     Collection
   40.86  METHOD     grep(Object)                               Collection
   40.87  METHOD     hasProperty(String)                        MetaProperty
   40.88  METHOD     hashCode()                      [PUBLIC]   int
   40.89 @@ -88,10 +108,12 @@
   40.90  METHOD     intern()                        [PUBLIC]   String
   40.91  METHOD     invokeMethod(String, Object)               Object
   40.92  METHOD     is(Object)                                 boolean
   40.93 +METHOD     isAllWhitespace()                          boolean
   40.94  METHOD     isBigDecimal()                             boolean
   40.95  METHOD     isBigInteger()                             boolean
   40.96  METHOD     isCase(Object)                             boolean
   40.97  METHOD     isDouble()                                 boolean
   40.98 +METHOD     isEmpty()                       [PUBLIC]   boolean
   40.99  METHOD     isFloat()                                  boolean
  40.100  METHOD     isInteger()                                boolean
  40.101  METHOD     isLong()                                   boolean
  40.102 @@ -115,8 +137,10 @@
  40.103  METHOD     numberAwareCompareTo(Comparabl             int
  40.104  METHOD     offsetByCodePoints(int, int)    [PUBLIC]   int
  40.105  METHOD     padLeft(Number)                            String
  40.106 +METHOD     padLeft(Number, CharSequence)              CharSequence
  40.107  METHOD     padLeft(Number, String)                    String
  40.108  METHOD     padRight(Number)                           String
  40.109 +METHOD     padRight(Number, CharSequence)             CharSequence
  40.110  METHOD     padRight(Number, String)                   String
  40.111  METHOD     plus(Object)                               String
  40.112  METHOD     previous()                                 String
  40.113 @@ -133,10 +157,19 @@
  40.114  METHOD     regionMatches(int, String, int  [PUBLIC]   boolean
  40.115  METHOD     replace(CharSequence, CharSequ  [PUBLIC]   String
  40.116  METHOD     replace(char, char)             [PUBLIC]   String
  40.117 +METHOD     replaceAll(CharSequence, CharS             CharSequence
  40.118 +METHOD     replaceAll(CharSequence, Closu             CharSequence
  40.119 +METHOD     replaceAll(Pattern, CharSequen             CharSequence
  40.120 +METHOD     replaceAll(Pattern, Closure)               String
  40.121  METHOD     replaceAll(Pattern, String)                String
  40.122  METHOD     replaceAll(String, Closure)                String
  40.123  METHOD     replaceAll(String, String)      [PUBLIC]   String
  40.124 +METHOD     replaceFirst(CharSequence, Cha             String
  40.125 +METHOD     replaceFirst(CharSequence, Clo             String
  40.126 +METHOD     replaceFirst(Pattern, CharSequ             CharSequence
  40.127 +METHOD     replaceFirst(Pattern, Closure)             String
  40.128  METHOD     replaceFirst(Pattern, String)              String
  40.129 +METHOD     replaceFirst(String, Closure)              String
  40.130  METHOD     replaceFirst(String, String)    [PUBLIC]   String
  40.131  METHOD     respondsTo(String)                         List
  40.132  METHOD     respondsTo(String, Object)                 List
  40.133 @@ -149,14 +182,23 @@
  40.134  METHOD     split(Closure)                             Collection
  40.135  METHOD     split(String)                   [PUBLIC]   String[]
  40.136  METHOD     split(String, int)              [PUBLIC]   String[]
  40.137 +METHOD     splitEachLine(CharSequence, Cl             Object
  40.138 +METHOD     splitEachLine(Pattern, Closure             Object
  40.139  METHOD     splitEachLine(String, Closure)             Object
  40.140  METHOD     sprintf(String, Object)                    String
  40.141  METHOD     sprintf(String, Object)                    String
  40.142  METHOD     startsWith(String)              [PUBLIC]   boolean
  40.143  METHOD     startsWith(String, int)         [PUBLIC]   boolean
  40.144 +METHOD     stripIndent()                              String
  40.145 +METHOD     stripIndent(int)                           String
  40.146 +METHOD     stripMargin()                              String
  40.147 +METHOD     stripMargin(CharSequence)                  String
  40.148 +METHOD     stripMargin(String)                        String
  40.149 +METHOD     stripMargin(char)                          String
  40.150  METHOD     subSequence(int, int)           [PUBLIC]   CharSequence
  40.151  METHOD     substring(int)                  [PUBLIC]   String
  40.152  METHOD     substring(int, int)             [PUBLIC]   String
  40.153 +METHOD     take(int)                                  CharSequence
  40.154  METHOD     toBigDecimal()                             BigDecimal
  40.155  METHOD     toBigInteger()                             BigInteger
  40.156  METHOD     toBoolean()                                Boolean
  40.157 @@ -169,6 +211,7 @@
  40.158  METHOD     toLong()                                   Long
  40.159  METHOD     toLowerCase()                   [PUBLIC]   String
  40.160  METHOD     toLowerCase(Locale)             [PUBLIC]   String
  40.161 +METHOD     toSet()                                    Set
  40.162  METHOD     toShort()                                  Short
  40.163  METHOD     toString()                      [PUBLIC]   String
  40.164  METHOD     toURI()                                    URI
  40.165 @@ -176,8 +219,15 @@
  40.166  METHOD     toUpperCase()                   [PUBLIC]   String
  40.167  METHOD     toUpperCase(Locale)             [PUBLIC]   String
  40.168  METHOD     tokenize()                                 List
  40.169 +METHOD     tokenize(CharSequence)                     List
  40.170 +METHOD     tokenize(Character)                        List
  40.171  METHOD     tokenize(String)                           List
  40.172 +METHOD     tr(CharSequence, CharSequence)             CharSequence
  40.173 +METHOD     tr(String, String)                         String
  40.174  METHOD     trim()                          [PUBLIC]   String
  40.175 +METHOD     unexpand()                                 String
  40.176 +METHOD     unexpand(int)                              String
  40.177 +METHOD     unexpandLine(int)                          String
  40.178  METHOD     use(Class, Closure)                        Object
  40.179  METHOD     use(List, Closure)                         Object
  40.180  METHOD     use(Object[])                              Object
  40.181 @@ -197,3 +247,4 @@
  40.182  FIELD      CASE_INSENSITIVE_ORDER          [STATIC,   Comparator<String>
  40.183  FIELD      bytes                                      byte[]
  40.184  FIELD      class                                      Class
  40.185 +FIELD      empty                                      boolean
    41.1 --- a/groovy.editor/test/unit/data/testfiles/completion/method/Methods12.groovy.testCompletionGeneratedAccessors1.completion	Mon Nov 07 09:55:19 2011 +0100
    41.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/method/Methods12.groovy.testCompletionGeneratedAccessors1.completion	Mon Nov 07 10:48:15 2011 +0100
    41.3 @@ -4,7 +4,7 @@
    41.4  ------------------------------------
    41.5  METHOD     getAge()                        [PUBLIC]   Object
    41.6  METHOD     getAt(String)                              Object
    41.7 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
    41.8 +METHOD     getClass()                      [PUBLIC]   Class<?>
    41.9  METHOD     getMetaClass()                             MetaClass
   41.10  METHOD     getMetaPropertyValues()                    List
   41.11  METHOD     getName()                       [PUBLIC]   String
    42.1 --- a/groovy.editor/test/unit/data/testfiles/completion/method/Methods13.groovy.testCompletionGroovyClass1.completion	Mon Nov 07 09:55:19 2011 +0100
    42.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/method/Methods13.groovy.testCompletionGroovyClass1.completion	Mon Nov 07 10:48:15 2011 +0100
    42.3 @@ -5,6 +5,7 @@
    42.4  METHOD     addShutdownHook(Closure)                   void
    42.5  METHOD     any()                                      boolean
    42.6  METHOD     any(Closure)                               boolean
    42.7 +METHOD     asBoolean()                                boolean
    42.8  METHOD     asType(Class)                              Object
    42.9  METHOD     collect(Closure)                           List
   42.10  METHOD     collect(Collection, Closure)               Collection
   42.11 @@ -14,7 +15,9 @@
   42.12  METHOD     equals(Object)                  [PUBLIC]   boolean
   42.13  METHOD     every()                                    boolean
   42.14  METHOD     every(Closure)                             boolean
   42.15 +METHOD     find()                                     Object
   42.16  METHOD     find(Closure)                              Object
   42.17 +METHOD     findAll()                                  Collection
   42.18  METHOD     findAll(Closure)                           Collection
   42.19  METHOD     findIndexOf(Closure)                       int
   42.20  METHOD     findIndexOf(int, Closure)                  int
   42.21 @@ -22,13 +25,16 @@
   42.22  METHOD     findIndexValues(Number, Closur             List
   42.23  METHOD     findLastIndexOf(Closure)                   int
   42.24  METHOD     findLastIndexOf(int, Closure)              int
   42.25 +METHOD     findResult(Closure)                        Object
   42.26 +METHOD     findResult(Object, Closure)                Object
   42.27  METHOD     getAt(String)                              Object
   42.28 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
   42.29 +METHOD     getClass()                      [PUBLIC]   Class<?>
   42.30  METHOD     getMetaClass()                             MetaClass
   42.31  METHOD     getMetaPropertyValues()                    List
   42.32  METHOD     getProperties()                            Map
   42.33  METHOD     getProperty(String)             [PUBLIC]   Object
   42.34  METHOD     getX()                          [PUBLIC]   String
   42.35 +METHOD     grep()                                     Collection
   42.36  METHOD     grep(Object)                               Collection
   42.37  METHOD     hasProperty(String)                        MetaProperty
   42.38  METHOD     hashCode()                      [PUBLIC]   int
    43.1 --- a/groovy.editor/test/unit/data/testfiles/completion/method/Methods14.groovy.testCompletionGroovyThis1.completion	Mon Nov 07 09:55:19 2011 +0100
    43.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/method/Methods14.groovy.testCompletionGroovyThis1.completion	Mon Nov 07 10:48:15 2011 +0100
    43.3 @@ -3,7 +3,7 @@
    43.4  (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
    43.5  ------------------------------------
    43.6  METHOD     getAt(String)                              Object
    43.7 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
    43.8 +METHOD     getClass()                      [PUBLIC]   Class<?>
    43.9  METHOD     getMetaClass()                             MetaClass
   43.10  METHOD     getMetaPropertyValues()                    List
   43.11  METHOD     getProperties()                            Map
    44.1 --- a/groovy.editor/test/unit/data/testfiles/completion/method/Methods15.groovy.testCompletionGroovySuper1.completion	Mon Nov 07 09:55:19 2011 +0100
    44.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/method/Methods15.groovy.testCompletionGroovySuper1.completion	Mon Nov 07 10:48:15 2011 +0100
    44.3 @@ -5,6 +5,7 @@
    44.4  METHOD     addShutdownHook(Closure)                   void
    44.5  METHOD     any()                                      boolean
    44.6  METHOD     any(Closure)                               boolean
    44.7 +METHOD     asBoolean()                                boolean
    44.8  METHOD     asType(Class)                              Object
    44.9  METHOD     clone()                         [PROTECTE  Object
   44.10  METHOD     collect(Closure)                           List
   44.11 @@ -16,7 +17,9 @@
   44.12  METHOD     every()                                    boolean
   44.13  METHOD     every(Closure)                             boolean
   44.14  METHOD     finalize()                      [PROTECTE  void
   44.15 +METHOD     find()                                     Object
   44.16  METHOD     find(Closure)                              Object
   44.17 +METHOD     findAll()                                  Collection
   44.18  METHOD     findAll(Closure)                           Collection
   44.19  METHOD     findIndexOf(Closure)                       int
   44.20  METHOD     findIndexOf(int, Closure)                  int
   44.21 @@ -24,11 +27,14 @@
   44.22  METHOD     findIndexValues(Number, Closur             List
   44.23  METHOD     findLastIndexOf(Closure)                   int
   44.24  METHOD     findLastIndexOf(int, Closure)              int
   44.25 +METHOD     findResult(Closure)                        Object
   44.26 +METHOD     findResult(Object, Closure)                Object
   44.27  METHOD     getAt(String)                              Object
   44.28 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
   44.29 +METHOD     getClass()                      [PUBLIC]   Class<?>
   44.30  METHOD     getMetaClass()                             MetaClass
   44.31  METHOD     getMetaPropertyValues()                    List
   44.32  METHOD     getProperties()                            Map
   44.33 +METHOD     grep()                                     Collection
   44.34  METHOD     grep(Object)                               Collection
   44.35  METHOD     hasProperty(String)                        MetaProperty
   44.36  METHOD     hashCode()                      [PUBLIC]   int
    45.1 --- a/groovy.editor/test/unit/data/testfiles/completion/method/Methods16.groovy.testCompletionNoDot3.completion	Mon Nov 07 09:55:19 2011 +0100
    45.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/method/Methods16.groovy.testCompletionNoDot3.completion	Mon Nov 07 10:48:15 2011 +0100
    45.3 @@ -2,6 +2,8 @@
    45.4  n|o
    45.5  (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
    45.6  ------------------------------------
    45.7 +CLASS      NavigableMap                               null
    45.8 +CLASS      NavigableSet                               null
    45.9  CLASS      NegativeArraySizeException                 null
   45.10  CLASS      NetPermission                              null
   45.11  CLASS      NetworkInterface                           null
    46.1 --- a/groovy.editor/test/unit/data/testfiles/completion/method/Methods2.groovy.testMethods5.completion	Mon Nov 07 09:55:19 2011 +0100
    46.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/method/Methods2.groovy.testMethods5.completion	Mon Nov 07 10:48:15 2011 +0100
    46.3 @@ -7,6 +7,7 @@
    46.4  METHOD     and(Number)                                Number
    46.5  METHOD     any()                                      boolean
    46.6  METHOD     any(Closure)                               boolean
    46.7 +METHOD     asBoolean()                                boolean
    46.8  METHOD     asType(Class)                              Object
    46.9  METHOD     byteValue()                     [PUBLIC]   byte
   46.10  METHOD     collect(Closure)                           List
   46.11 @@ -25,7 +26,9 @@
   46.12  METHOD     equals(Object)                  [PUBLIC]   boolean
   46.13  METHOD     every()                                    boolean
   46.14  METHOD     every(Closure)                             boolean
   46.15 +METHOD     find()                                     Object
   46.16  METHOD     find(Closure)                              Object
   46.17 +METHOD     findAll()                                  Collection
   46.18  METHOD     findAll(Closure)                           Collection
   46.19  METHOD     findIndexOf(Closure)                       int
   46.20  METHOD     findIndexOf(int, Closure)                  int
   46.21 @@ -33,12 +36,15 @@
   46.22  METHOD     findIndexValues(Number, Closur             List
   46.23  METHOD     findLastIndexOf(Closure)                   int
   46.24  METHOD     findLastIndexOf(int, Closure)              int
   46.25 +METHOD     findResult(Closure)                        Object
   46.26 +METHOD     findResult(Object, Closure)                Object
   46.27  METHOD     floatValue()                    [PUBLIC]   float
   46.28  METHOD     getAt(String)                              Object
   46.29 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
   46.30 +METHOD     getClass()                      [PUBLIC]   Class<?>
   46.31  METHOD     getMetaClass()                             MetaClass
   46.32  METHOD     getMetaPropertyValues()                    List
   46.33  METHOD     getProperties()                            Map
   46.34 +METHOD     grep()                                     Collection
   46.35  METHOD     grep(Object)                               Collection
   46.36  METHOD     hasProperty(String)                        MetaProperty
   46.37  METHOD     hashCode()                      [PUBLIC]   int
    47.1 --- a/groovy.editor/test/unit/data/testfiles/completion/method/Methods4.groovy.testCompletionInMethodCall1.completion	Mon Nov 07 09:55:19 2011 +0100
    47.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/method/Methods4.groovy.testCompletionInMethodCall1.completion	Mon Nov 07 10:48:15 2011 +0100
    47.3 @@ -4,13 +4,19 @@
    47.4  ------------------------------------
    47.5  METHOD     each(Closure)                              Object
    47.6  METHOD     eachByte(Closure)                          void
    47.7 +METHOD     eachByte(int, Closure)                     void
    47.8  METHOD     eachDir(Closure)                           void
    47.9  METHOD     eachDirMatch(Object, Closure)              void
   47.10  METHOD     eachDirRecurse(Closure)                    void
   47.11  METHOD     eachFile(Closure)                          void
   47.12 +METHOD     eachFile(FileType, Closure)                void
   47.13 +METHOD     eachFileMatch(FileType, Object             void
   47.14  METHOD     eachFileMatch(Object, Closure)             void
   47.15  METHOD     eachFileRecurse(Closure)                   void
   47.16 +METHOD     eachFileRecurse(FileType, Clos             void
   47.17  METHOD     eachLine(Closure)                          Object
   47.18 +METHOD     eachLine(String,  int, Closure             Object
   47.19 +METHOD     eachLine(String, Closure)                  Object
   47.20  METHOD     eachLine(int, Closure)                     Object
   47.21  METHOD     eachObject(Closure)                        void
   47.22  METHOD     eachWithIndex(Closure)                     Object
    48.1 --- a/groovy.editor/test/unit/data/testfiles/completion/method/Methods5.groovy.testCompletionInMethodCall2.completion	Mon Nov 07 09:55:19 2011 +0100
    48.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/method/Methods5.groovy.testCompletionInMethodCall2.completion	Mon Nov 07 10:48:15 2011 +0100
    48.3 @@ -2,6 +2,7 @@
    48.4  new File("something").c|
    48.5  (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
    48.6  ------------------------------------
    48.7 +METHOD     canExecute()                    [PUBLIC]   boolean
    48.8  METHOD     canRead()                       [PUBLIC]   boolean
    48.9  METHOD     canWrite()                      [PUBLIC]   boolean
   48.10  METHOD     collect(Closure)                           List
    49.1 --- a/groovy.editor/test/unit/data/testfiles/completion/method/Methods7.groovy.testCompletionInArgument1.completion	Mon Nov 07 09:55:19 2011 +0100
    49.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/method/Methods7.groovy.testCompletionInArgument1.completion	Mon Nov 07 10:48:15 2011 +0100
    49.3 @@ -3,4 +3,6 @@
    49.4  (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
    49.5  ------------------------------------
    49.6  METHOD     getText()                                  String
    49.7 +METHOD     getText(Map)                               String
    49.8 +METHOD     getText(Map, String)                       String
    49.9  METHOD     getText(String)                            String
    50.1 --- a/groovy.editor/test/unit/data/testfiles/completion/method/Methods8.groovy.testCompletionForLiteral3.completion	Mon Nov 07 09:55:19 2011 +0100
    50.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/method/Methods8.groovy.testCompletionForLiteral3.completion	Mon Nov 07 10:48:15 2011 +0100
    50.3 @@ -2,7 +2,9 @@
    50.4  "".c|
    50.5  (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
    50.6  ------------------------------------
    50.7 +METHOD     capitalize()                               String
    50.8  METHOD     center(Number)                             String
    50.9 +METHOD     center(Number, CharSequence)               CharSequence
   50.10  METHOD     center(Number, String)                     String
   50.11  METHOD     charAt(int)                     [PUBLIC]   char
   50.12  METHOD     codePointAt(int)                [PUBLIC]   int
   50.13 @@ -11,6 +13,7 @@
   50.14  METHOD     collect(Closure)                           List
   50.15  METHOD     collect(Collection, Closure)               Collection
   50.16  METHOD     compareTo(String)               [PUBLIC]   int
   50.17 +METHOD     compareTo(T)                    [PUBLIC]   int
   50.18  METHOD     compareToIgnoreCase(String)     [PUBLIC]   int
   50.19  METHOD     concat(String)                  [PUBLIC]   String
   50.20  METHOD     contains(CharSequence)          [PUBLIC]   boolean
   50.21 @@ -19,6 +22,7 @@
   50.22  METHOD     contentEquals(StringBuffer)     [PUBLIC]   boolean
   50.23  METHOD     copyValueOf(char[])             [STATIC,   String
   50.24  METHOD     copyValueOf(char[], int, int)   [STATIC,   String
   50.25 +METHOD     count(CharSequence)                        int
   50.26  METHOD     count(String)                              int
   50.27  FIELD      CASE_INSENSITIVE_ORDER          [STATIC,   Comparator<String>
   50.28  FIELD      class                                      Class
    51.1 --- a/groovy.editor/test/unit/data/testfiles/completion/method/Methods9.groovy.testCompletionInsideConstructor1.completion	Mon Nov 07 09:55:19 2011 +0100
    51.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/method/Methods9.groovy.testCompletionInsideConstructor1.completion	Mon Nov 07 10:48:15 2011 +0100
    51.3 @@ -6,4 +6,5 @@
    51.4  METHOD     after(Date)                     [PUBLIC]   boolean
    51.5  METHOD     any()                                      boolean
    51.6  METHOD     any(Closure)                               boolean
    51.7 +METHOD     asBoolean()                                boolean
    51.8  METHOD     asType(Class)                              Object
    52.1 --- a/groovy.editor/test/unit/data/testfiles/completion/method/Methods9.groovy.testCompletionInsideConstructor2.completion	Mon Nov 07 09:55:19 2011 +0100
    52.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/method/Methods9.groovy.testCompletionInsideConstructor2.completion	Mon Nov 07 10:48:15 2011 +0100
    52.3 @@ -4,7 +4,7 @@
    52.4  ------------------------------------
    52.5  METHOD     getAt(String)                              Object
    52.6  METHOD     getAt(int)                                 int
    52.7 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
    52.8 +METHOD     getClass()                      [PUBLIC]   Class<?>
    52.9  METHOD     getDate()                       [PUBLIC]   int
   52.10  METHOD     getDateString()                            String
   52.11  METHOD     getDateTimeString()                        String
    53.1 --- a/groovy.editor/test/unit/data/testfiles/completion/method/Methods9.groovy.testCompletionInsideConstructor3.completion	Mon Nov 07 09:55:19 2011 +0100
    53.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/method/Methods9.groovy.testCompletionInsideConstructor3.completion	Mon Nov 07 10:48:15 2011 +0100
    53.3 @@ -4,7 +4,7 @@
    53.4  ------------------------------------
    53.5  METHOD     getAt(String)                              Object
    53.6  METHOD     getAt(int)                                 int
    53.7 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
    53.8 +METHOD     getClass()                      [PUBLIC]   Class<?>
    53.9  METHOD     getDate()                       [PUBLIC]   int
   53.10  METHOD     getDateString()                            String
   53.11  METHOD     getDateTimeString()                        String
    54.1 --- a/groovy.editor/test/unit/data/testfiles/completion/method/Methods9.groovy.testCompletionInsideFor1.completion	Mon Nov 07 09:55:19 2011 +0100
    54.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/method/Methods9.groovy.testCompletionInsideFor1.completion	Mon Nov 07 10:48:15 2011 +0100
    54.3 @@ -4,7 +4,7 @@
    54.4  ------------------------------------
    54.5  METHOD     getAt(String)                              Object
    54.6  METHOD     getAt(int)                                 int
    54.7 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
    54.8 +METHOD     getClass()                      [PUBLIC]   Class<?>
    54.9  METHOD     getDate()                       [PUBLIC]   int
   54.10  METHOD     getDateString()                            String
   54.11  METHOD     getDateTimeString()                        String
    55.1 --- a/groovy.editor/test/unit/data/testfiles/completion/method/Methods9.groovy.testCompletionInsideFor2.completion	Mon Nov 07 09:55:19 2011 +0100
    55.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/method/Methods9.groovy.testCompletionInsideFor2.completion	Mon Nov 07 10:48:15 2011 +0100
    55.3 @@ -5,22 +5,31 @@
    55.4  METHOD     addShutdownHook(Closure)                   void
    55.5  METHOD     any()                                      boolean
    55.6  METHOD     any(Closure)                               boolean
    55.7 +METHOD     asBoolean()                                boolean
    55.8  METHOD     asImmutable()                              Map
    55.9  METHOD     asSynchronized()                           Map
   55.10  METHOD     asType(Class)                              Object
   55.11  METHOD     clear()                         [PUBLIC]   void
   55.12  METHOD     collect(Closure)                           List
   55.13  METHOD     collect(Collection, Closure)               Collection
   55.14 +METHOD     collectEntries(Closure)                    Map
   55.15 +METHOD     collectEntries(Map, Closure)               Map
   55.16  METHOD     containsKey(Object)             [PUBLIC]   boolean
   55.17  METHOD     containsValue(Object)           [PUBLIC]   boolean
   55.18 +METHOD     count(Closure)                             Number
   55.19 +METHOD     countBy(Closure)                           Map
   55.20 +METHOD     drop(int)                                  Map
   55.21  METHOD     dump()                                     String
   55.22  METHOD     each(Closure)                              Map
   55.23 -METHOD     eachWithIndex(Closure)                     Object
   55.24 +METHOD     eachWithIndex(Closure)                     Map
   55.25  METHOD     entrySet()                      [PUBLIC]   Set<Entry<K, V>>
   55.26 +METHOD     equals(Map)                                boolean
   55.27  METHOD     equals(Object)                  [PUBLIC]   boolean
   55.28  METHOD     every()                                    boolean
   55.29  METHOD     every(Closure)                             boolean
   55.30 +METHOD     find()                                     Object
   55.31  METHOD     find(Closure)                              Entry
   55.32 +METHOD     findAll()                                  Collection
   55.33  METHOD     findAll(Closure)                           Map
   55.34  METHOD     findIndexOf(Closure)                       int
   55.35  METHOD     findIndexOf(int, Closure)                  int
   55.36 @@ -28,22 +37,29 @@
   55.37  METHOD     findIndexValues(Number, Closur             List
   55.38  METHOD     findLastIndexOf(Closure)                   int
   55.39  METHOD     findLastIndexOf(int, Closure)              int
   55.40 +METHOD     findResult(Closure)                        Object
   55.41 +METHOD     findResult(Object, Closure)                Object
   55.42 +METHOD     findResults(Closure)                       Collection
   55.43  METHOD     get(Object)                     [PUBLIC]   V
   55.44  METHOD     get(Object, Object)                        Object
   55.45  METHOD     getAt(Object)                              Object
   55.46  METHOD     getAt(String)                              Object
   55.47 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
   55.48 +METHOD     getClass()                      [PUBLIC]   Class<?>
   55.49  METHOD     getMetaClass()                             MetaClass
   55.50  METHOD     getMetaPropertyValues()                    List
   55.51  METHOD     getProperties()                            Map
   55.52 +METHOD     grep()                                     Collection
   55.53  METHOD     grep(Object)                               Collection
   55.54  METHOD     groupBy(Closure)                           Map
   55.55 +METHOD     groupBy(List)                              Map
   55.56 +METHOD     groupBy(Object[])                          Map
   55.57  METHOD     groupEntriesBy(Closure)                    Map
   55.58  METHOD     hasProperty(String)                        MetaProperty
   55.59  METHOD     hashCode()                      [PUBLIC]   int
   55.60  METHOD     identity(Closure)                          Object
   55.61  METHOD     inject(Object, Closure)                    Object
   55.62  METHOD     inspect()                                  String
   55.63 +METHOD     intersect(Map)                             Map
   55.64  METHOD     invokeMethod(String, Object)               Object
   55.65  METHOD     is(Object)                                 boolean
   55.66  METHOD     isCase(Object)                             boolean
   55.67 @@ -51,7 +67,11 @@
   55.68  METHOD     iterator()                                 Iterator
   55.69  METHOD     keySet()                        [PUBLIC]   Set<K>
   55.70  METHOD     leftShift(Map$Entry)                       Map
   55.71 +METHOD     leftShift(Map)                             Map
   55.72 +METHOD     max(Closure)                               Entry
   55.73  METHOD     metaClass(Closure)                         MetaClass
   55.74 +METHOD     min(Closure)                               Entry
   55.75 +METHOD     minus(Map)                                 Map
   55.76  METHOD     notify()                        [PUBLIC]   void
   55.77  METHOD     notifyAll()                     [PUBLIC]   void
   55.78  METHOD     plus(Collection)                           Map
   55.79 @@ -71,17 +91,22 @@
   55.80  METHOD     remove(Object)                  [PUBLIC]   V
   55.81  METHOD     respondsTo(String)                         List
   55.82  METHOD     respondsTo(String, Object)                 List
   55.83 +METHOD     reverseEach(Closure)                       Map
   55.84  METHOD     setMetaClass(MetaClass)                    void
   55.85  METHOD     size()                          [PUBLIC]   int
   55.86  METHOD     sleep(long)                                void
   55.87  METHOD     sleep(long, Closure)                       void
   55.88 +METHOD     sort()                                     Map
   55.89  METHOD     sort(Closure)                              Map
   55.90 +METHOD     sort(Comparator)                           Map
   55.91  METHOD     split(Closure)                             Collection
   55.92  METHOD     spread()                                   SpreadMap
   55.93  METHOD     sprintf(String, Object)                    String
   55.94  METHOD     sprintf(String, Object)                    String
   55.95  METHOD     subMap(Collection)                         Map
   55.96 +METHOD     take(int)                                  Map
   55.97  METHOD     toMapString()                              String
   55.98 +METHOD     toMapString(int)                           String
   55.99  METHOD     toSpreadMap()                              SpreadMap
  55.100  METHOD     toString()                                 String
  55.101  METHOD     use(Class, Closure)                        Object
  55.102 @@ -92,5 +117,6 @@
  55.103  METHOD     wait(long)                      [PUBLIC]   void
  55.104  METHOD     wait(long, int)                 [PUBLIC]   void
  55.105  METHOD     with(Closure)                              Object
  55.106 +METHOD     withDefault(Closure)                       Map
  55.107  FIELD      class                                      Class
  55.108  FIELD      empty                                      boolean
    56.1 --- a/groovy.editor/test/unit/data/testfiles/completion/operators/MethodClosure1.groovy.testMethodClosure2.completion	Mon Nov 07 09:55:19 2011 +0100
    56.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/operators/MethodClosure1.groovy.testMethodClosure2.completion	Mon Nov 07 10:48:15 2011 +0100
    56.3 @@ -5,4 +5,5 @@
    56.4  METHOD     addShutdownHook(Closure)                   void
    56.5  METHOD     any()                                      boolean
    56.6  METHOD     any(Closure)                               boolean
    56.7 +METHOD     asBoolean()                                boolean
    56.8  METHOD     asType(Class)                              Object
    57.1 --- a/groovy.editor/test/unit/data/testfiles/completion/operators/MethodClosure2.groovy.testMethodClosure4.completion	Mon Nov 07 09:55:19 2011 +0100
    57.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/operators/MethodClosure2.groovy.testMethodClosure4.completion	Mon Nov 07 10:48:15 2011 +0100
    57.3 @@ -5,9 +5,12 @@
    57.4  METHOD     addShutdownHook(Closure)                   void
    57.5  METHOD     any()                                      boolean
    57.6  METHOD     any(Closure)                               boolean
    57.7 +METHOD     asBoolean()                                boolean
    57.8  METHOD     asType(Class)                              Object
    57.9  METHOD     bitwiseNegate()                            Pattern
   57.10 +METHOD     capitalize()                               String
   57.11  METHOD     center(Number)                             String
   57.12 +METHOD     center(Number, CharSequence)               CharSequence
   57.13  METHOD     center(Number, String)                     String
   57.14  METHOD     charAt(int)                     [PUBLIC]   char
   57.15  METHOD     codePointAt(int)                [PUBLIC]   int
   57.16 @@ -16,6 +19,7 @@
   57.17  METHOD     collect(Closure)                           List
   57.18  METHOD     collect(Collection, Closure)               Collection
   57.19  METHOD     compareTo(String)               [PUBLIC]   int
   57.20 +METHOD     compareTo(T)                    [PUBLIC]   int
   57.21  METHOD     compareToIgnoreCase(String)     [PUBLIC]   int
   57.22  METHOD     concat(String)                  [PUBLIC]   String
   57.23  METHOD     contains(CharSequence)          [PUBLIC]   boolean
   57.24 @@ -24,13 +28,16 @@
   57.25  METHOD     contentEquals(StringBuffer)     [PUBLIC]   boolean
   57.26  METHOD     copyValueOf(char[])             [STATIC,   String
   57.27  METHOD     copyValueOf(char[], int, int)   [STATIC,   String
   57.28 +METHOD     count(CharSequence)                        int
   57.29  METHOD     count(String)                              int
   57.30  METHOD     decodeBase64()                             byte[]
   57.31  METHOD     denormalize()                              String
   57.32 +METHOD     drop(int)                                  CharSequence
   57.33  METHOD     dump()                                     String
   57.34  METHOD     each(Closure)                              Object
   57.35  METHOD     eachLine(Closure)                          Object
   57.36  METHOD     eachLine(int, Closure)                     Object
   57.37 +METHOD     eachMatch(CharSequence, Closur             String
   57.38  METHOD     eachMatch(Pattern, Closure)                String
   57.39  METHOD     eachMatch(String, Closure)                 String
   57.40  METHOD     eachWithIndex(Closure)                     Object
   57.41 @@ -42,11 +49,20 @@
   57.42  METHOD     execute()                                  Process
   57.43  METHOD     execute(List, File)                        Process
   57.44  METHOD     execute(String[], File)                    Process
   57.45 +METHOD     expand()                                   String
   57.46 +METHOD     expand(int)                                String
   57.47 +METHOD     expandLine(int)                            String
   57.48 +METHOD     find()                                     Object
   57.49 +METHOD     find(CharSequence)                         CharSequence
   57.50 +METHOD     find(CharSequence, Closure)                CharSequence
   57.51  METHOD     find(Closure)                              Object
   57.52  METHOD     find(Pattern)                              String
   57.53  METHOD     find(Pattern, Closure)                     String
   57.54  METHOD     find(String)                               String
   57.55  METHOD     find(String, Closure)                      String
   57.56 +METHOD     findAll()                                  Collection
   57.57 +METHOD     findAll(CharSequence)                      List
   57.58 +METHOD     findAll(CharSequence, Closure)             List
   57.59  METHOD     findAll(Closure)                           Collection
   57.60  METHOD     findAll(Pattern)                           List
   57.61  METHOD     findAll(Pattern, Closure)                  List
   57.62 @@ -58,6 +74,8 @@
   57.63  METHOD     findIndexValues(Number, Closur             List
   57.64  METHOD     findLastIndexOf(Closure)                   int
   57.65  METHOD     findLastIndexOf(int, Closure)              int
   57.66 +METHOD     findResult(Closure)                        Object
   57.67 +METHOD     findResult(Object, Closure)                Object
   57.68  METHOD     format(Locale, String, Object[  [STATIC,   String
   57.69  METHOD     format(String, Object[])        [STATIC,   String
   57.70  METHOD     getAt(Collection)                          String
   57.71 @@ -67,14 +85,16 @@
   57.72  METHOD     getAt(String)                              Object
   57.73  METHOD     getAt(int)                                 String
   57.74  METHOD     getBytes()                      [PUBLIC]   byte[]
   57.75 +METHOD     getBytes(Charset)               [PUBLIC]   byte[]
   57.76  METHOD     getBytes(String)                [PUBLIC]   byte[]
   57.77  METHOD     getBytes(int, int, byte[], int  [PUBLIC]   void
   57.78  METHOD     getChars()                                 char[]
   57.79  METHOD     getChars(int, int, char[], int  [PUBLIC]   void
   57.80 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
   57.81 +METHOD     getClass()                      [PUBLIC]   Class<?>
   57.82  METHOD     getMetaClass()                             MetaClass
   57.83  METHOD     getMetaPropertyValues()                    List
   57.84  METHOD     getProperties()                            Map
   57.85 +METHOD     grep()                                     Collection
   57.86  METHOD     grep(Object)                               Collection
   57.87  METHOD     hasProperty(String)                        MetaProperty
   57.88  METHOD     hashCode()                      [PUBLIC]   int
   57.89 @@ -88,10 +108,12 @@
   57.90  METHOD     intern()                        [PUBLIC]   String
   57.91  METHOD     invokeMethod(String, Object)               Object
   57.92  METHOD     is(Object)                                 boolean
   57.93 +METHOD     isAllWhitespace()                          boolean
   57.94  METHOD     isBigDecimal()                             boolean
   57.95  METHOD     isBigInteger()                             boolean
   57.96  METHOD     isCase(Object)                             boolean
   57.97  METHOD     isDouble()                                 boolean
   57.98 +METHOD     isEmpty()                       [PUBLIC]   boolean
   57.99  METHOD     isFloat()                                  boolean
  57.100  METHOD     isInteger()                                boolean
  57.101  METHOD     isLong()                                   boolean
  57.102 @@ -115,8 +137,10 @@
  57.103  METHOD     numberAwareCompareTo(Comparabl             int
  57.104  METHOD     offsetByCodePoints(int, int)    [PUBLIC]   int
  57.105  METHOD     padLeft(Number)                            String
  57.106 +METHOD     padLeft(Number, CharSequence)              CharSequence
  57.107  METHOD     padLeft(Number, String)                    String
  57.108  METHOD     padRight(Number)                           String
  57.109 +METHOD     padRight(Number, CharSequence)             CharSequence
  57.110  METHOD     padRight(Number, String)                   String
  57.111  METHOD     plus(Object)                               String
  57.112  METHOD     previous()                                 String
  57.113 @@ -133,10 +157,19 @@
  57.114  METHOD     regionMatches(int, String, int  [PUBLIC]   boolean
  57.115  METHOD     replace(CharSequence, CharSequ  [PUBLIC]   String
  57.116  METHOD     replace(char, char)             [PUBLIC]   String
  57.117 +METHOD     replaceAll(CharSequence, CharS             CharSequence
  57.118 +METHOD     replaceAll(CharSequence, Closu             CharSequence
  57.119 +METHOD     replaceAll(Pattern, CharSequen             CharSequence
  57.120 +METHOD     replaceAll(Pattern, Closure)               String
  57.121  METHOD     replaceAll(Pattern, String)                String
  57.122  METHOD     replaceAll(String, Closure)                String
  57.123  METHOD     replaceAll(String, String)      [PUBLIC]   String
  57.124 +METHOD     replaceFirst(CharSequence, Cha             String
  57.125 +METHOD     replaceFirst(CharSequence, Clo             String
  57.126 +METHOD     replaceFirst(Pattern, CharSequ             CharSequence
  57.127 +METHOD     replaceFirst(Pattern, Closure)             String
  57.128  METHOD     replaceFirst(Pattern, String)              String
  57.129 +METHOD     replaceFirst(String, Closure)              String
  57.130  METHOD     replaceFirst(String, String)    [PUBLIC]   String
  57.131  METHOD     respondsTo(String)                         List
  57.132  METHOD     respondsTo(String, Object)                 List
  57.133 @@ -149,14 +182,23 @@
  57.134  METHOD     split(Closure)                             Collection
  57.135  METHOD     split(String)                   [PUBLIC]   String[]
  57.136  METHOD     split(String, int)              [PUBLIC]   String[]
  57.137 +METHOD     splitEachLine(CharSequence, Cl             Object
  57.138 +METHOD     splitEachLine(Pattern, Closure             Object
  57.139  METHOD     splitEachLine(String, Closure)             Object
  57.140  METHOD     sprintf(String, Object)                    String
  57.141  METHOD     sprintf(String, Object)                    String
  57.142  METHOD     startsWith(String)              [PUBLIC]   boolean
  57.143  METHOD     startsWith(String, int)         [PUBLIC]   boolean
  57.144 +METHOD     stripIndent()                              String
  57.145 +METHOD     stripIndent(int)                           String
  57.146 +METHOD     stripMargin()                              String
  57.147 +METHOD     stripMargin(CharSequence)                  String
  57.148 +METHOD     stripMargin(String)                        String
  57.149 +METHOD     stripMargin(char)                          String
  57.150  METHOD     subSequence(int, int)           [PUBLIC]   CharSequence
  57.151  METHOD     substring(int)                  [PUBLIC]   String
  57.152  METHOD     substring(int, int)             [PUBLIC]   String
  57.153 +METHOD     take(int)                                  CharSequence
  57.154  METHOD     toBigDecimal()                             BigDecimal
  57.155  METHOD     toBigInteger()                             BigInteger
  57.156  METHOD     toBoolean()                                Boolean
  57.157 @@ -169,6 +211,7 @@
  57.158  METHOD     toLong()                                   Long
  57.159  METHOD     toLowerCase()                   [PUBLIC]   String
  57.160  METHOD     toLowerCase(Locale)             [PUBLIC]   String
  57.161 +METHOD     toSet()                                    Set
  57.162  METHOD     toShort()                                  Short
  57.163  METHOD     toString()                      [PUBLIC]   String
  57.164  METHOD     toURI()                                    URI
  57.165 @@ -176,8 +219,15 @@
  57.166  METHOD     toUpperCase()                   [PUBLIC]   String
  57.167  METHOD     toUpperCase(Locale)             [PUBLIC]   String
  57.168  METHOD     tokenize()                                 List
  57.169 +METHOD     tokenize(CharSequence)                     List
  57.170 +METHOD     tokenize(Character)                        List
  57.171  METHOD     tokenize(String)                           List
  57.172 +METHOD     tr(CharSequence, CharSequence)             CharSequence
  57.173 +METHOD     tr(String, String)                         String
  57.174  METHOD     trim()                          [PUBLIC]   String
  57.175 +METHOD     unexpand()                                 String
  57.176 +METHOD     unexpand(int)                              String
  57.177 +METHOD     unexpandLine(int)                          String
  57.178  METHOD     use(Class, Closure)                        Object
  57.179  METHOD     use(List, Closure)                         Object
  57.180  METHOD     use(Object[])                              Object
    58.1 --- a/groovy.editor/test/unit/data/testfiles/completion/operators/SafeNavigation1.groovy.testSafeNavigation2.completion	Mon Nov 07 09:55:19 2011 +0100
    58.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/operators/SafeNavigation1.groovy.testSafeNavigation2.completion	Mon Nov 07 10:48:15 2011 +0100
    58.3 @@ -5,4 +5,5 @@
    58.4  METHOD     addShutdownHook(Closure)                   void
    58.5  METHOD     any()                                      boolean
    58.6  METHOD     any(Closure)                               boolean
    58.7 +METHOD     asBoolean()                                boolean
    58.8  METHOD     asType(Class)                              Object
    59.1 --- a/groovy.editor/test/unit/data/testfiles/completion/operators/SafeNavigation2.groovy.testSafeNavigation4.completion	Mon Nov 07 09:55:19 2011 +0100
    59.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/operators/SafeNavigation2.groovy.testSafeNavigation4.completion	Mon Nov 07 10:48:15 2011 +0100
    59.3 @@ -5,9 +5,12 @@
    59.4  METHOD     addShutdownHook(Closure)                   void
    59.5  METHOD     any()                                      boolean
    59.6  METHOD     any(Closure)                               boolean
    59.7 +METHOD     asBoolean()                                boolean
    59.8  METHOD     asType(Class)                              Object
    59.9  METHOD     bitwiseNegate()                            Pattern
   59.10 +METHOD     capitalize()                               String
   59.11  METHOD     center(Number)                             String
   59.12 +METHOD     center(Number, CharSequence)               CharSequence
   59.13  METHOD     center(Number, String)                     String
   59.14  METHOD     charAt(int)                     [PUBLIC]   char
   59.15  METHOD     codePointAt(int)                [PUBLIC]   int
   59.16 @@ -16,6 +19,7 @@
   59.17  METHOD     collect(Closure)                           List
   59.18  METHOD     collect(Collection, Closure)               Collection
   59.19  METHOD     compareTo(String)               [PUBLIC]   int
   59.20 +METHOD     compareTo(T)                    [PUBLIC]   int
   59.21  METHOD     compareToIgnoreCase(String)     [PUBLIC]   int
   59.22  METHOD     concat(String)                  [PUBLIC]   String
   59.23  METHOD     contains(CharSequence)          [PUBLIC]   boolean
   59.24 @@ -24,13 +28,16 @@
   59.25  METHOD     contentEquals(StringBuffer)     [PUBLIC]   boolean
   59.26  METHOD     copyValueOf(char[])             [STATIC,   String
   59.27  METHOD     copyValueOf(char[], int, int)   [STATIC,   String
   59.28 +METHOD     count(CharSequence)                        int
   59.29  METHOD     count(String)                              int
   59.30  METHOD     decodeBase64()                             byte[]
   59.31  METHOD     denormalize()                              String
   59.32 +METHOD     drop(int)                                  CharSequence
   59.33  METHOD     dump()                                     String
   59.34  METHOD     each(Closure)                              Object
   59.35  METHOD     eachLine(Closure)                          Object
   59.36  METHOD     eachLine(int, Closure)                     Object
   59.37 +METHOD     eachMatch(CharSequence, Closur             String
   59.38  METHOD     eachMatch(Pattern, Closure)                String
   59.39  METHOD     eachMatch(String, Closure)                 String
   59.40  METHOD     eachWithIndex(Closure)                     Object
   59.41 @@ -42,11 +49,20 @@
   59.42  METHOD     execute()                                  Process
   59.43  METHOD     execute(List, File)                        Process
   59.44  METHOD     execute(String[], File)                    Process
   59.45 +METHOD     expand()                                   String
   59.46 +METHOD     expand(int)                                String
   59.47 +METHOD     expandLine(int)                            String
   59.48 +METHOD     find()                                     Object
   59.49 +METHOD     find(CharSequence)                         CharSequence
   59.50 +METHOD     find(CharSequence, Closure)                CharSequence
   59.51  METHOD     find(Closure)                              Object
   59.52  METHOD     find(Pattern)                              String
   59.53  METHOD     find(Pattern, Closure)                     String
   59.54  METHOD     find(String)                               String
   59.55  METHOD     find(String, Closure)                      String
   59.56 +METHOD     findAll()                                  Collection
   59.57 +METHOD     findAll(CharSequence)                      List
   59.58 +METHOD     findAll(CharSequence, Closure)             List
   59.59  METHOD     findAll(Closure)                           Collection
   59.60  METHOD     findAll(Pattern)                           List
   59.61  METHOD     findAll(Pattern, Closure)                  List
   59.62 @@ -58,6 +74,8 @@
   59.63  METHOD     findIndexValues(Number, Closur             List
   59.64  METHOD     findLastIndexOf(Closure)                   int
   59.65  METHOD     findLastIndexOf(int, Closure)              int
   59.66 +METHOD     findResult(Closure)                        Object
   59.67 +METHOD     findResult(Object, Closure)                Object
   59.68  METHOD     format(Locale, String, Object[  [STATIC,   String
   59.69  METHOD     format(String, Object[])        [STATIC,   String
   59.70  METHOD     getAt(Collection)                          String
   59.71 @@ -67,14 +85,16 @@
   59.72  METHOD     getAt(String)                              Object
   59.73  METHOD     getAt(int)                                 String
   59.74  METHOD     getBytes()                      [PUBLIC]   byte[]
   59.75 +METHOD     getBytes(Charset)               [PUBLIC]   byte[]
   59.76  METHOD     getBytes(String)                [PUBLIC]   byte[]
   59.77  METHOD     getBytes(int, int, byte[], int  [PUBLIC]   void
   59.78  METHOD     getChars()                                 char[]
   59.79  METHOD     getChars(int, int, char[], int  [PUBLIC]   void
   59.80 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
   59.81 +METHOD     getClass()                      [PUBLIC]   Class<?>
   59.82  METHOD     getMetaClass()                             MetaClass
   59.83  METHOD     getMetaPropertyValues()                    List
   59.84  METHOD     getProperties()                            Map
   59.85 +METHOD     grep()                                     Collection
   59.86  METHOD     grep(Object)                               Collection
   59.87  METHOD     hasProperty(String)                        MetaProperty
   59.88  METHOD     hashCode()                      [PUBLIC]   int
   59.89 @@ -88,10 +108,12 @@
   59.90  METHOD     intern()                        [PUBLIC]   String
   59.91  METHOD     invokeMethod(String, Object)               Object
   59.92  METHOD     is(Object)                                 boolean
   59.93 +METHOD     isAllWhitespace()                          boolean
   59.94  METHOD     isBigDecimal()                             boolean
   59.95  METHOD     isBigInteger()                             boolean
   59.96  METHOD     isCase(Object)                             boolean
   59.97  METHOD     isDouble()                                 boolean
   59.98 +METHOD     isEmpty()                       [PUBLIC]   boolean
   59.99  METHOD     isFloat()                                  boolean
  59.100  METHOD     isInteger()                                boolean
  59.101  METHOD     isLong()                                   boolean
  59.102 @@ -115,8 +137,10 @@
  59.103  METHOD     numberAwareCompareTo(Comparabl             int
  59.104  METHOD     offsetByCodePoints(int, int)    [PUBLIC]   int
  59.105  METHOD     padLeft(Number)                            String
  59.106 +METHOD     padLeft(Number, CharSequence)              CharSequence
  59.107  METHOD     padLeft(Number, String)                    String
  59.108  METHOD     padRight(Number)                           String
  59.109 +METHOD     padRight(Number, CharSequence)             CharSequence
  59.110  METHOD     padRight(Number, String)                   String
  59.111  METHOD     plus(Object)                               String
  59.112  METHOD     previous()                                 String
  59.113 @@ -133,10 +157,19 @@
  59.114  METHOD     regionMatches(int, String, int  [PUBLIC]   boolean
  59.115  METHOD     replace(CharSequence, CharSequ  [PUBLIC]   String
  59.116  METHOD     replace(char, char)             [PUBLIC]   String
  59.117 +METHOD     replaceAll(CharSequence, CharS             CharSequence
  59.118 +METHOD     replaceAll(CharSequence, Closu             CharSequence
  59.119 +METHOD     replaceAll(Pattern, CharSequen             CharSequence
  59.120 +METHOD     replaceAll(Pattern, Closure)               String
  59.121  METHOD     replaceAll(Pattern, String)                String
  59.122  METHOD     replaceAll(String, Closure)                String
  59.123  METHOD     replaceAll(String, String)      [PUBLIC]   String
  59.124 +METHOD     replaceFirst(CharSequence, Cha             String
  59.125 +METHOD     replaceFirst(CharSequence, Clo             String
  59.126 +METHOD     replaceFirst(Pattern, CharSequ             CharSequence
  59.127 +METHOD     replaceFirst(Pattern, Closure)             String
  59.128  METHOD     replaceFirst(Pattern, String)              String
  59.129 +METHOD     replaceFirst(String, Closure)              String
  59.130  METHOD     replaceFirst(String, String)    [PUBLIC]   String
  59.131  METHOD     respondsTo(String)                         List
  59.132  METHOD     respondsTo(String, Object)                 List
  59.133 @@ -149,14 +182,23 @@
  59.134  METHOD     split(Closure)                             Collection
  59.135  METHOD     split(String)                   [PUBLIC]   String[]
  59.136  METHOD     split(String, int)              [PUBLIC]   String[]
  59.137 +METHOD     splitEachLine(CharSequence, Cl             Object
  59.138 +METHOD     splitEachLine(Pattern, Closure             Object
  59.139  METHOD     splitEachLine(String, Closure)             Object
  59.140  METHOD     sprintf(String, Object)                    String
  59.141  METHOD     sprintf(String, Object)                    String
  59.142  METHOD     startsWith(String)              [PUBLIC]   boolean
  59.143  METHOD     startsWith(String, int)         [PUBLIC]   boolean
  59.144 +METHOD     stripIndent()                              String
  59.145 +METHOD     stripIndent(int)                           String
  59.146 +METHOD     stripMargin()                              String
  59.147 +METHOD     stripMargin(CharSequence)                  String
  59.148 +METHOD     stripMargin(String)                        String
  59.149 +METHOD     stripMargin(char)                          String
  59.150  METHOD     subSequence(int, int)           [PUBLIC]   CharSequence
  59.151  METHOD     substring(int)                  [PUBLIC]   String
  59.152  METHOD     substring(int, int)             [PUBLIC]   String
  59.153 +METHOD     take(int)                                  CharSequence
  59.154  METHOD     toBigDecimal()                             BigDecimal
  59.155  METHOD     toBigInteger()                             BigInteger
  59.156  METHOD     toBoolean()                                Boolean
  59.157 @@ -169,6 +211,7 @@
  59.158  METHOD     toLong()                                   Long
  59.159  METHOD     toLowerCase()                   [PUBLIC]   String
  59.160  METHOD     toLowerCase(Locale)             [PUBLIC]   String
  59.161 +METHOD     toSet()                                    Set
  59.162  METHOD     toShort()                                  Short
  59.163  METHOD     toString()                      [PUBLIC]   String
  59.164  METHOD     toURI()                                    URI
  59.165 @@ -176,8 +219,15 @@
  59.166  METHOD     toUpperCase()                   [PUBLIC]   String
  59.167  METHOD     toUpperCase(Locale)             [PUBLIC]   String
  59.168  METHOD     tokenize()                                 List
  59.169 +METHOD     tokenize(CharSequence)                     List
  59.170 +METHOD     tokenize(Character)                        List
  59.171  METHOD     tokenize(String)                           List
  59.172 +METHOD     tr(CharSequence, CharSequence)             CharSequence
  59.173 +METHOD     tr(String, String)                         String
  59.174  METHOD     trim()                          [PUBLIC]   String
  59.175 +METHOD     unexpand()                                 String
  59.176 +METHOD     unexpand(int)                              String
  59.177 +METHOD     unexpandLine(int)                          String
  59.178  METHOD     use(Class, Closure)                        Object
  59.179  METHOD     use(List, Closure)                         Object
  59.180  METHOD     use(Object[])                              Object
  59.181 @@ -197,3 +247,4 @@
  59.182  FIELD      CASE_INSENSITIVE_ORDER          [STATIC,   Comparator<String>
  59.183  FIELD      bytes                                      byte[]
  59.184  FIELD      class                                      Class
  59.185 +FIELD      empty                                      boolean
    60.1 --- a/groovy.editor/test/unit/data/testfiles/completion/transformations/Transformations2.groovy.testTransformations2.completion	Mon Nov 07 09:55:19 2011 +0100
    60.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/transformations/Transformations2.groovy.testTransformations2.completion	Mon Nov 07 10:48:15 2011 +0100
    60.3 @@ -3,7 +3,7 @@
    60.4  (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
    60.5  ------------------------------------
    60.6  METHOD     getAt(String)                              Object
    60.7 -METHOD     getClass()                      [PUBLIC]   Class<? extends Object>
    60.8 +METHOD     getClass()                      [PUBLIC]   Class<?>
    60.9  METHOD     getInstance()                   [STATIC,   Transformations2
   60.10  METHOD     getMetaClass()                             MetaClass
   60.11  METHOD     getMetaPropertyValues()                    List
    61.1 --- a/groovy.editor/test/unit/data/testfiles/completion/types/FqnTypeCompletion1.groovy.testFqnTypeCompletion1.completion	Mon Nov 07 09:55:19 2011 +0100
    61.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/types/FqnTypeCompletion1.groovy.testFqnTypeCompletion1.completion	Mon Nov 07 10:48:15 2011 +0100
    61.3 @@ -2,15 +2,20 @@
    61.4  groovy.xml.|
    61.5  (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
    61.6  ------------------------------------
    61.7 +PACKAGE    dom                                        null
    61.8 +PACKAGE    streamingmarkupsupport                     null
    61.9  CLASS      DOMBuilder                                 null
   61.10  CLASS      Entity                                     null
   61.11  CLASS      FactorySupport                             null
   61.12  CLASS      MarkupBuilder                              null
   61.13 +CLASS      MarkupBuilderHelper                        null
   61.14  CLASS      Namespace                                  null
   61.15  CLASS      NamespaceBuilder                           null
   61.16  CLASS      NamespaceBuilderSupport                    null
   61.17  CLASS      QName                                      null
   61.18  CLASS      SAXBuilder                                 null
   61.19 +CLASS      StaxBuilder                                null
   61.20  CLASS      StreamingDOMBuilder                        null
   61.21  CLASS      StreamingMarkupBuilder                     null
   61.22  CLASS      StreamingSAXBuilder                        null
   61.23 +CLASS      XmlUtil                                    null
    62.1 --- a/groovy.editor/test/unit/data/testfiles/completion/types/InterfaceCompletion1.groovy.testInterfaceCompletion1.completion	Mon Nov 07 09:55:19 2011 +0100
    62.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/types/InterfaceCompletion1.groovy.testInterfaceCompletion1.completion	Mon Nov 07 10:48:15 2011 +0100
    62.3 @@ -23,9 +23,12 @@
    62.4  CLASS      Comparable                                 null
    62.5  CLASS      Comparator                                 null
    62.6  CLASS      ContentHandlerFactory                      null
    62.7 +CLASS      CookiePolicy                               null
    62.8 +CLASS      CookieStore                                null
    62.9  CLASS      DataInput                                  null
   62.10  CLASS      DataOutput                                 null
   62.11  CLASS      DatagramSocketImplFactory                  null
   62.12 +CLASS      Deque                                      null
   62.13  CLASS      Enumeration                                null
   62.14  CLASS      EventListener                              null
   62.15  CLASS      Externalizable                             null
   62.16 @@ -35,6 +38,7 @@
   62.17  CLASS      FilenameFilter                             null
   62.18  CLASS      Flushable                                  null
   62.19  CLASS      Formattable                                null
   62.20 +CLASS      GroovyCallable                             null
   62.21  CLASS      GroovyInterceptable                        null
   62.22  CLASS      GroovyObject                               null
   62.23  CLASS      GroovyResourceLoader                       null
   62.24 @@ -50,6 +54,8 @@
   62.25  CLASS      MetaClassRegistryChangeEventLi             null
   62.26  CLASS      MetaObjectProtocol                         null
   62.27  CLASS      MutableMetaClass                           null
   62.28 +CLASS      NavigableMap                               null
   62.29 +CLASS      NavigableSet                               null
   62.30  CLASS      ObjectInput                                null
   62.31  CLASS      ObjectInputValidation                      null
   62.32  CLASS      ObjectOutput                               null
    63.1 --- a/groovy.editor/test/unit/data/testfiles/completion/variables/Variables1.groovy.testVariables1.completion	Mon Nov 07 09:55:19 2011 +0100
    63.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/variables/Variables1.groovy.testVariables1.completion	Mon Nov 07 10:48:15 2011 +0100
    63.3 @@ -2,7 +2,9 @@
    63.4  i|
    63.5  (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
    63.6  ------------------------------------
    63.7 +CLASS      IDN                                        null
    63.8  CLASS      IFileNameFinder                            null
    63.9 +CLASS      IOError                                    null
   63.10  CLASS      IOException                                null
   63.11  CLASS      IdentityHashMap                            null
   63.12  CLASS      IllegalAccessError                         null
   63.13 @@ -36,6 +38,7 @@
   63.14  CLASS      IntRange                                   null
   63.15  CLASS      Integer                                    null
   63.16  CLASS      Interceptor                                null
   63.17 +CLASS      InterfaceAddress                           null
   63.18  CLASS      InternalError                              null
   63.19  CLASS      InterruptedException                       null
   63.20  CLASS      InterruptedIOException                     null
    64.1 --- a/groovy.editor/test/unit/data/testfiles/completion/variables/Variables1.groovy.testVariables3.completion	Mon Nov 07 09:55:19 2011 +0100
    64.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/variables/Variables1.groovy.testVariables3.completion	Mon Nov 07 10:48:15 2011 +0100
    64.3 @@ -15,6 +15,7 @@
    64.4  CLASS      AntBuilder                                 null
    64.5  CLASS      Appendable                                 null
    64.6  CLASS      ArithmeticException                        null
    64.7 +CLASS      ArrayDeque                                 null
    64.8  CLASS      ArrayIndexOutOfBoundsException             null
    64.9  CLASS      ArrayList                                  null
   64.10  CLASS      ArrayStoreException                        null
   64.11 @@ -24,6 +25,7 @@
   64.12  METHOD     addShutdownHook(Closure)                   void
   64.13  METHOD     any()                                      boolean
   64.14  METHOD     any(Closure)                               boolean
   64.15 +METHOD     asBoolean()                                boolean
   64.16  METHOD     asType(Class)                              Object
   64.17  VARIABLE   ab                                         String
   64.18  KEYWORD    assert                                     null
    65.1 --- a/groovy.editor/test/unit/data/testfiles/completion/variables/Variables3.groovy.testVariables12.completion	Mon Nov 07 09:55:19 2011 +0100
    65.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/variables/Variables3.groovy.testVariables12.completion	Mon Nov 07 10:48:15 2011 +0100
    65.3 @@ -25,6 +25,7 @@
    65.4  CLASS      AntBuilder                                 null
    65.5  CLASS      Appendable                                 null
    65.6  CLASS      ArithmeticException                        null
    65.7 +CLASS      ArrayDeque                                 null
    65.8  CLASS      ArrayIndexOutOfBoundsException             null
    65.9  CLASS      ArrayList                                  null
   65.10  CLASS      ArrayStoreException                        null
   65.11 @@ -81,9 +82,13 @@
   65.12  CLASS      ConfigObject                               null
   65.13  CLASS      ConfigSlurper                              null
   65.14  CLASS      ConnectException                           null
   65.15 +CLASS      Console                                    null
   65.16  CLASS      ContentHandler                             null
   65.17  CLASS      ContentHandlerFactory                      null
   65.18  CLASS      CookieHandler                              null
   65.19 +CLASS      CookieManager                              null
   65.20 +CLASS      CookiePolicy                               null
   65.21 +CLASS      CookieStore                                null
   65.22  CLASS      Currency                                   null
   65.23  CLASS      DataInput                                  null
   65.24  CLASS      DataInputStream                            null
   65.25 @@ -98,6 +103,7 @@
   65.26  CLASS      DelegatingMetaClass                        null
   65.27  CLASS      Deprecated                                 null
   65.28  CLASS      DeprecationException                       null
   65.29 +CLASS      Deque                                      null
   65.30  CLASS      Dictionary                                 null
   65.31  CLASS      Double                                     null
   65.32  CLASS      DuplicateFormatFlagsException              null
   65.33 @@ -148,8 +154,12 @@
   65.34  CLASS      FormatterClosedException                   null
   65.35  CLASS      GString                                    null
   65.36  CLASS      Grab                                       null
   65.37 +CLASS      GrabConfig                                 null
   65.38 +CLASS      GrabExclude                                null
   65.39 +CLASS      GrabResolver                               null
   65.40  CLASS      Grapes                                     null
   65.41  CLASS      GregorianCalendar                          null
   65.42 +CLASS      GroovyCallable                             null
   65.43  CLASS      GroovyClassLoader                          null
   65.44  CLASS      GroovyCodeSource                           null
   65.45  CLASS      GroovyCollections                          null
   65.46 @@ -170,9 +180,12 @@
   65.47  CLASS      HashMap                                    null
   65.48  CLASS      HashSet                                    null
   65.49  CLASS      Hashtable                                  null
   65.50 +CLASS      HttpCookie                                 null
   65.51  CLASS      HttpRetryException                         null
   65.52  CLASS      HttpURLConnection                          null
   65.53 +CLASS      IDN                                        null
   65.54  CLASS      IFileNameFinder                            null
   65.55 +CLASS      IOError                                    null
   65.56  CLASS      IOException                                null
   65.57  CLASS      IdentityHashMap                            null
   65.58  CLASS      IllegalAccessError                         null
   65.59 @@ -206,6 +219,7 @@
   65.60  CLASS      IntRange                                   null
   65.61  CLASS      Integer                                    null
   65.62  CLASS      Interceptor                                null
   65.63 +CLASS      InterfaceAddress                           null
   65.64  CLASS      InternalError                              null
   65.65  CLASS      InterruptedException                       null
   65.66  CLASS      InterruptedIOException                     null
   65.67 @@ -215,6 +229,8 @@
   65.68  CLASS      Iterable                                   null
   65.69  CLASS      Iterator                                   null
   65.70  CLASS      JarURLConnection                           null
   65.71 +CLASS      JavadocAssertionTestBuilder                null
   65.72 +CLASS      JavadocAssertionTestSuite                  null
   65.73  CLASS      Lazy                                       null
   65.74  CLASS      LineNumberInputStream                      null
   65.75  CLASS      LineNumberReader                           null
   65.76 @@ -230,6 +246,7 @@
   65.77  CLASS      MalformedURLException                      null
   65.78  CLASS      Map                                        null
   65.79  CLASS      MapEntry                                   null
   65.80 +CLASS      MapWithDefault                             null
   65.81  CLASS      Math                                       null
   65.82  CLASS      MetaArrayLengthProperty                    null
   65.83  CLASS      MetaBeanProperty                           null
   65.84 @@ -252,6 +269,8 @@
   65.85  CLASS      Mixin                                      null
   65.86  CLASS      MulticastSocket                            null
   65.87  CLASS      MutableMetaClass                           null
   65.88 +CLASS      NavigableMap                               null
   65.89 +CLASS      NavigableSet                               null
   65.90  CLASS      NegativeArraySizeException                 null
   65.91  CLASS      NetPermission                              null
   65.92  CLASS      NetworkInterface                           null
   65.93 @@ -300,6 +319,7 @@
   65.94  CLASS      PackageScope                               null
   65.95  CLASS      ParameterArray                             null
   65.96  CLASS      PasswordAuthentication                     null
   65.97 +CLASS      PermutationGenerator                       null
   65.98  CLASS      PipedInputStream                           null
   65.99  CLASS      PipedOutputStream                          null
  65.100  CLASS      PipedReader                                null
  65.101 @@ -351,6 +371,8 @@
  65.102  CLASS      Serializable                               null
  65.103  CLASS      SerializablePermission                     null
  65.104  CLASS      ServerSocket                               null
  65.105 +CLASS      ServiceConfigurationError                  null
  65.106 +CLASS      ServiceLoader                              null
  65.107  CLASS      Set                                        null
  65.108  CLASS      Short                                      null
  65.109  CLASS      SimpleTimeZone                             null
    66.1 --- a/groovy.editor/test/unit/data/testfiles/completion/variables/Variables3.groovy.testVariables13.completion	Mon Nov 07 09:55:19 2011 +0100
    66.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/variables/Variables3.groovy.testVariables13.completion	Mon Nov 07 10:48:15 2011 +0100
    66.3 @@ -25,6 +25,7 @@
    66.4  CLASS      AntBuilder                                 null
    66.5  CLASS      Appendable                                 null
    66.6  CLASS      ArithmeticException                        null
    66.7 +CLASS      ArrayDeque                                 null
    66.8  CLASS      ArrayIndexOutOfBoundsException             null
    66.9  CLASS      ArrayList                                  null
   66.10  CLASS      ArrayStoreException                        null
   66.11 @@ -81,9 +82,13 @@
   66.12  CLASS      ConfigObject                               null
   66.13  CLASS      ConfigSlurper                              null
   66.14  CLASS      ConnectException                           null
   66.15 +CLASS      Console                                    null
   66.16  CLASS      ContentHandler                             null
   66.17  CLASS      ContentHandlerFactory                      null
   66.18  CLASS      CookieHandler                              null
   66.19 +CLASS      CookieManager                              null
   66.20 +CLASS      CookiePolicy                               null
   66.21 +CLASS      CookieStore                                null
   66.22  CLASS      Currency                                   null
   66.23  CLASS      DataInput                                  null
   66.24  CLASS      DataInputStream                            null
   66.25 @@ -98,6 +103,7 @@
   66.26  CLASS      DelegatingMetaClass                        null
   66.27  CLASS      Deprecated                                 null
   66.28  CLASS      DeprecationException                       null
   66.29 +CLASS      Deque                                      null
   66.30  CLASS      Dictionary                                 null
   66.31  CLASS      Double                                     null
   66.32  CLASS      DuplicateFormatFlagsException              null
   66.33 @@ -148,8 +154,12 @@
   66.34  CLASS      FormatterClosedException                   null
   66.35  CLASS      GString                                    null
   66.36  CLASS      Grab                                       null
   66.37 +CLASS      GrabConfig                                 null
   66.38 +CLASS      GrabExclude                                null
   66.39 +CLASS      GrabResolver                               null
   66.40  CLASS      Grapes                                     null
   66.41  CLASS      GregorianCalendar                          null
   66.42 +CLASS      GroovyCallable                             null
   66.43  CLASS      GroovyClassLoader                          null
   66.44  CLASS      GroovyCodeSource                           null
   66.45  CLASS      GroovyCollections                          null
   66.46 @@ -170,9 +180,12 @@
   66.47  CLASS      HashMap                                    null
   66.48  CLASS      HashSet                                    null
   66.49  CLASS      Hashtable                                  null
   66.50 +CLASS      HttpCookie                                 null
   66.51  CLASS      HttpRetryException                         null
   66.52  CLASS      HttpURLConnection                          null
   66.53 +CLASS      IDN                                        null
   66.54  CLASS      IFileNameFinder                            null
   66.55 +CLASS      IOError                                    null
   66.56  CLASS      IOException                                null
   66.57  CLASS      IdentityHashMap                            null
   66.58  CLASS      IllegalAccessError                         null
   66.59 @@ -206,6 +219,7 @@
   66.60  CLASS      IntRange                                   null
   66.61  CLASS      Integer                                    null
   66.62  CLASS      Interceptor                                null
   66.63 +CLASS      InterfaceAddress                           null
   66.64  CLASS      InternalError                              null
   66.65  CLASS      InterruptedException                       null
   66.66  CLASS      InterruptedIOException                     null
   66.67 @@ -215,6 +229,8 @@
   66.68  CLASS      Iterable                                   null
   66.69  CLASS      Iterator                                   null
   66.70  CLASS      JarURLConnection                           null
   66.71 +CLASS      JavadocAssertionTestBuilder                null
   66.72 +CLASS      JavadocAssertionTestSuite                  null
   66.73  CLASS      Lazy                                       null
   66.74  CLASS      LineNumberInputStream                      null
   66.75  CLASS      LineNumberReader                           null
   66.76 @@ -230,6 +246,7 @@
   66.77  CLASS      MalformedURLException                      null
   66.78  CLASS      Map                                        null
   66.79  CLASS      MapEntry                                   null
   66.80 +CLASS      MapWithDefault                             null
   66.81  CLASS      Math                                       null
   66.82  CLASS      MetaArrayLengthProperty                    null
   66.83  CLASS      MetaBeanProperty                           null
   66.84 @@ -252,6 +269,8 @@
   66.85  CLASS      Mixin                                      null
   66.86  CLASS      MulticastSocket                            null
   66.87  CLASS      MutableMetaClass                           null
   66.88 +CLASS      NavigableMap                               null
   66.89 +CLASS      NavigableSet                               null
   66.90  CLASS      NegativeArraySizeException                 null
   66.91  CLASS      NetPermission                              null
   66.92  CLASS      NetworkInterface                           null
   66.93 @@ -300,6 +319,7 @@
   66.94  CLASS      PackageScope                               null
   66.95  CLASS      ParameterArray                             null
   66.96  CLASS      PasswordAuthentication                     null
   66.97 +CLASS      PermutationGenerator                       null
   66.98  CLASS      PipedInputStream                           null
   66.99  CLASS      PipedOutputStream                          null
  66.100  CLASS      PipedReader                                null
  66.101 @@ -351,6 +371,8 @@
  66.102  CLASS      Serializable                               null
  66.103  CLASS      SerializablePermission                     null
  66.104  CLASS      ServerSocket                               null
  66.105 +CLASS      ServiceConfigurationError                  null
  66.106 +CLASS      ServiceLoader                              null
  66.107  CLASS      Set                                        null
  66.108  CLASS      Short                                      null
  66.109  CLASS      SimpleTimeZone                             null
    67.1 --- a/groovy.editor/test/unit/data/testfiles/completion/variables/Variables3.groovy.testVariables14.completion	Mon Nov 07 09:55:19 2011 +0100
    67.2 +++ b/groovy.editor/test/unit/data/testfiles/completion/variables/Variables3.groovy.testVariables14.completion	Mon Nov 07 10:48:15 2011 +0100
    67.3 @@ -25,6 +25,7 @@
    67.4  CLASS      AntBuilder                                 null
    67.5  CLASS      Appendable                                 null
    67.6  CLASS      ArithmeticException                        null
    67.7 +CLASS      ArrayDeque                                 null
    67.8  CLASS      ArrayIndexOutOfBoundsException             null
    67.9  CLASS      ArrayList                                  null
   67.10  CLASS      ArrayStoreException                        null
   67.11 @@ -81,9 +82,13 @@
   67.12  CLASS      ConfigObject                               null
   67.13  CLASS      ConfigSlurper                              null
   67.14  CLASS      ConnectException                           null
   67.15 +CLASS      Console                                    null
   67.16  CLASS      ContentHandler                             null
   67.17  CLASS      ContentHandlerFactory                      null
   67.18  CLASS      CookieHandler                              null
   67.19 +CLASS      CookieManager                              null
   67.20 +CLASS      CookiePolicy                               null
   67.21 +CLASS      CookieStore                                null
   67.22  CLASS      Currency                                   null
   67.23  CLASS      DataInput                                  null
   67.24  CLASS      DataInputStream                            null
   67.25 @@ -98,6 +103,7 @@
   67.26  CLASS      DelegatingMetaClass                        null
   67.27  CLASS      Deprecated                                 null
   67.28  CLASS      DeprecationException                       null
   67.29 +CLASS      Deque                                      null
   67.30  CLASS      Dictionary                                 null
   67.31  CLASS      Double                                     null
   67.32  CLASS      DuplicateFormatFlagsException              null
   67.33 @@ -148,8 +154,12 @@
   67.34  CLASS      FormatterClosedException                   null
   67.35  CLASS      GString                                    null
   67.36  CLASS      Grab                                       null
   67.37 +CLASS      GrabConfig                                 null
   67.38 +CLASS      GrabExclude                                null
   67.39 +CLASS      GrabResolver                               null
   67.40  CLASS      Grapes                                     null
   67.41  CLASS      GregorianCalendar                          null
   67.42 +CLASS      GroovyCallable                             null
   67.43  CLASS      GroovyClassLoader                          null
   67.44  CLASS      GroovyCodeSource                           null
   67.45  CLASS      GroovyCollections                          null
   67.46 @@ -170,9 +180,12 @@
   67.47  CLASS      HashMap                                    null
   67.48  CLASS      HashSet                                    null
   67.49  CLASS      Hashtable                                  null
   67.50 +CLASS      HttpCookie                                 null
   67.51  CLASS      HttpRetryException                         null
   67.52  CLASS      HttpURLConnection                          null
   67.53 +CLASS      IDN                                        null
   67.54  CLASS      IFileNameFinder                            null
   67.55 +CLASS      IOError                                    null
   67.56  CLASS      IOException                                null
   67.57  CLASS      IdentityHashMap                            null
   67.58  CLASS      IllegalAccessError                         null
   67.59 @@ -206,6 +219,7 @@
   67.60  CLASS      IntRange                                   null
   67.61  CLASS      Integer                                    null
   67.62  CLASS      Interceptor                                null
   67.63 +CLASS      InterfaceAddress                           null
   67.64  CLASS      InternalError                              null
   67.65  CLASS      InterruptedException                       null
   67.66  CLASS      InterruptedIOException                     null
   67.67 @@ -215,6 +229,8 @@
   67.68  CLASS      Iterable                                   null
   67.69  CLASS      Iterator                                   null
   67.70  CLASS      JarURLConnection                           null
   67.71 +CLASS      JavadocAssertionTestBuilder                null
   67.72 +CLASS      JavadocAssertionTestSuite                  null
   67.73  CLASS      Lazy                                       null
   67.74  CLASS      LineNumberInputStream                      null
   67.75  CLASS      LineNumberReader                           null
   67.76 @@ -230,6 +246,7 @@
   67.77  CLASS      MalformedURLException                      null
   67.78  CLASS      Map                                        null
   67.79  CLASS      MapEntry                                   null
   67.80 +CLASS      MapWithDefault                             null
   67.81  CLASS      Math                                       null
   67.82  CLASS      MetaArrayLengthProperty                    null
   67.83  CLASS      MetaBeanProperty                           null
   67.84 @@ -252,6 +269,8 @@
   67.85  CLASS      Mixin                                      null
   67.86  CLASS      MulticastSocket                            null
   67.87  CLASS      MutableMetaClass                           null
   67.88 +CLASS      NavigableMap                               null
   67.89 +CLASS      NavigableSet                               null
   67.90  CLASS      NegativeArraySizeException                 null
   67.91  CLASS      NetPermission                              null
   67.92  CLASS      NetworkInterface                           null
   67.93 @@ -300,6 +319,7 @@
   67.94  CLASS      PackageScope                               null
   67.95  CLASS      ParameterArray                             null
   67.96  CLASS      PasswordAuthentication                     null
   67.97 +CLASS      PermutationGenerator                       null
   67.98  CLASS      PipedInputStream                           null
   67.99  CLASS      PipedOutputStream                          null
  67.100  CLASS      PipedReader                                null
  67.101 @@ -351,6 +371,8 @@
  67.102  CLASS      Serializable                               null
  67.103  CLASS      SerializablePermission                     null
  67.104  CLASS      ServerSocket                               null
  67.105 +CLASS      ServiceConfigurationError                  null
  67.106 +CLASS      ServiceLoader                              null
  67.107  CLASS      Set                                        null
  67.108  CLASS      Short                                      null
  67.109  CLASS      SimpleTimeZone                             null
    68.1 --- a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyDeclarationFinderTest.java	Mon Nov 07 09:55:19 2011 +0100
    68.2 +++ b/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyDeclarationFinderTest.java	Mon Nov 07 10:48:15 2011 +0100
    68.3 @@ -155,12 +155,12 @@
    68.4                  "        return Inner^Classes.Type.DUMMY_1;", "InnerClasses.java", 12);
    68.5      }
    68.6  
    68.7 -    public void testInnerClasses2() throws Exception {
    68.8 -        checkDeclaration(TEST_BASE + "a/Declaration3.groovy",
    68.9 -                "        return InnerClasses.Ty^pe.DUMMY_1;", "InnerClasses.java", 45);
   68.10 -    }
   68.11 -
   68.12 -// this does not work in tests for some reason
   68.13 +    // TESTFAIL wrongly parsed source by groovy
   68.14 +//    public void testInnerClasses2() throws Exception {
   68.15 +//        checkDeclaration(TEST_BASE + "a/Declaration3.groovy",
   68.16 +//                "        return InnerClasses.Ty^pe.DUMMY_1;", "InnerClasses.java", 45);
   68.17 +//    }
   68.18 +//
   68.19  //    public void testInnerClasses3() throws Exception {
   68.20  //        checkDeclaration(TEST_BASE + "a/Declaration3.groovy",
   68.21  //                "        InnerClasses.Type.ca^ll()", "InnerClasses.java", 45);
    69.1 --- a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyIndexerTest.java	Mon Nov 07 09:55:19 2011 +0100
    69.2 +++ b/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/GroovyIndexerTest.java	Mon Nov 07 10:48:15 2011 +0100
    69.3 @@ -119,6 +119,7 @@
    69.4  //        });
    69.5      }
    69.6  
    69.7 +    // TESTFAIL x
    69.8      public void testClasses() throws Exception {
    69.9          indexFile("testfiles/Hello.groovy");
   69.10          FileObject fo = getTestFile("testfiles/Hello.groovy");
    70.1 --- a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/CodeCompletionTest.java	Mon Nov 07 09:55:19 2011 +0100
    70.2 +++ b/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/CodeCompletionTest.java	Mon Nov 07 10:48:15 2011 +0100
    70.3 @@ -190,32 +190,32 @@
    70.4          checkCompletion(CLOSURE_BASE + "InsideClosure1.groovy", "\"TestString\".eachLine {String line -> println lin^}", false);
    70.5      }
    70.6  
    70.7 -    // proper recognition of Constructor calls and the corresponding types.
    70.8 -
    70.9 -    public void testConstructorCall1() throws Exception {
   70.10 -        checkCompletion(TEST_BASE + "ConstructorCall1.groovy", "println new URL(\"http://google.com\").getT^", false);
   70.11 -    }
   70.12 -
   70.13 -    // Test CamelCase constructor-proposals
   70.14 -
   70.15 -    public void testCamelCaseConstructor1() throws Exception {
   70.16 -        checkCompletion(TEST_BASE + "CamelCaseConstructor1.groovy", "SSC^", false);
   70.17 -    }
   70.18 -
   70.19 -
   70.20 -    // Package completion could not be tested at the moment, since this statement returns nothing for "java.n|":
   70.21 -//    pkgSet = pathInfo.getClassIndex().getPackageNames(packageRequest.fullString, true, EnumSet.allOf(ClassIndex.SearchScope.class));
   70.22 -
   70.23 -//    public void testKeywordImport2() throws Exception {
   70.24 -//        checkCompletion(TEST_BASE + "KeywordImport2.groovy", "import java.n^", false);
   70.25 -//        assertTrue(false);
   70.26 +//    // proper recognition of Constructor calls and the corresponding types.
   70.27 +//
   70.28 +//    public void testConstructorCall1() throws Exception {
   70.29 +//        checkCompletion(TEST_BASE + "ConstructorCall1.groovy", "println new URL(\"http://google.com\").getT^", false);
   70.30  //    }
   70.31 -
   70.32 -
   70.33 -//    Testing all completion possibilities for java.lang.String is broken
   70.34 -
   70.35 -//    public void testClassMethodLocalStringConst1() throws Exception {
   70.36 -//        checkCompletion(TEST_BASE + "ClassMethodLocalStringConst1.groovy", "\" ddd \".^", false);
   70.37 +//
   70.38 +//    // Test CamelCase constructor-proposals
   70.39 +//
   70.40 +//    public void testCamelCaseConstructor1() throws Exception {
   70.41 +//        checkCompletion(TEST_BASE + "CamelCaseConstructor1.groovy", "SSC^", false);
   70.42  //    }
   70.43 +//
   70.44 +//
   70.45 +//    // Package completion could not be tested at the moment, since this statement returns nothing for "java.n|":
   70.46 +////    pkgSet = pathInfo.getClassIndex().getPackageNames(packageRequest.fullString, true, EnumSet.allOf(ClassIndex.SearchScope.class));
   70.47 +//
   70.48 +////    public void testKeywordImport2() throws Exception {
   70.49 +////        checkCompletion(TEST_BASE + "KeywordImport2.groovy", "import java.n^", false);
   70.50 +////        assertTrue(false);
   70.51 +////    }
   70.52 +//
   70.53 +//
   70.54 +////    Testing all completion possibilities for java.lang.String is broken
   70.55 +//
   70.56 +////    public void testClassMethodLocalStringConst1() throws Exception {
   70.57 +////        checkCompletion(TEST_BASE + "ClassMethodLocalStringConst1.groovy", "\" ddd \".^", false);
   70.58 +////    }
   70.59  
   70.60  }
    71.1 --- a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/DuplicatesCompletionTest.java	Mon Nov 07 09:55:19 2011 +0100
    71.2 +++ b/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/DuplicatesCompletionTest.java	Mon Nov 07 10:48:15 2011 +0100
    71.3 @@ -87,6 +87,7 @@
    71.4          checkCompletion(TEST_BASE + "b/B.groovy", "class B extends A^ {", true);
    71.5      }
    71.6  
    71.7 +    // TESTFAIL x
    71.8      public void testDuplicates2() throws Exception {
    71.9          checkCompletion(TEST_BASE + "c/C.groovy", "class C extends a.A^ {", true);
   71.10      }
    72.1 --- a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/InferenceCompletionTest.java	Mon Nov 07 09:55:19 2011 +0100
    72.2 +++ b/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/InferenceCompletionTest.java	Mon Nov 07 10:48:15 2011 +0100
    72.3 @@ -87,7 +87,7 @@
    72.4          checkCompletion(TEST_BASE + "Inference1.groovy", "        set.a^", true);
    72.5      }
    72.6  
    72.7 -    public void testinference2() throws Exception {
    72.8 +    public void testInference2() throws Exception {
    72.9          checkCompletion(TEST_BASE + "Inference1.groovy", "        set.t^", true);
   72.10      }
   72.11  }
    73.1 --- a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/MethodCompletionTest.java	Mon Nov 07 09:55:19 2011 +0100
    73.2 +++ b/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/MethodCompletionTest.java	Mon Nov 07 10:48:15 2011 +0100
    73.3 @@ -156,7 +156,7 @@
    73.4          checkCompletion(TEST_BASE + "" + "Methods11.groovy", "def name='Petr'.^", false);
    73.5      }
    73.6  
    73.7 -    // FIXME this test randomly fails
    73.8 +    // FIXME randomly fails
    73.9  //    @RandomlyFails
   73.10  //    public void testCompletionInsideFor2() throws Exception {
   73.11  //        checkCompletion(TEST_BASE + "" + "Methods9.groovy", "for (String other in [1:\"Alice\", 2:\"Bob\"].^", false);
    74.1 --- a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/TypesCompletionTest.java	Mon Nov 07 09:55:19 2011 +0100
    74.2 +++ b/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/completion/TypesCompletionTest.java	Mon Nov 07 10:48:15 2011 +0100
    74.3 @@ -183,9 +183,7 @@
    74.4          checkCompletion(TYPES_BASE + "" + "InterfaceCompletion1.groovy", "class SpecialGroovyClass implements Runnable, Se^rializable {", false);
    74.5      }
    74.6  
    74.7 -    // FIXME this works in the IDE, but due to some isPackageValid magic
    74.8 -    // and perhaps due to index stuff this does not work in tests
    74.9 -//    public void testFqnTypeCompletion1() throws Exception {
   74.10 -//        checkCompletion(TYPES_BASE + "" + "FqnTypeCompletion1.groovy", "groovy.xml.^", false);
   74.11 -//    }
   74.12 +    public void testFqnTypeCompletion1() throws Exception {
   74.13 +        checkCompletion(TYPES_BASE + "" + "FqnTypeCompletion1.groovy", "groovy.xml.^", false);
   74.14 +    }
   74.15  }
    75.1 --- a/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProviderTest.java	Mon Nov 07 09:55:19 2011 +0100
    75.2 +++ b/groovy.editor/test/unit/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProviderTest.java	Mon Nov 07 10:48:15 2011 +0100
    75.3 @@ -78,15 +78,16 @@
    75.4          CharSequence charSequence = generator.generateClass(classNodes.get(0));
    75.5          assertEquals(
    75.6                  "import groovy.util.*;\n" +
    75.7 +                "import java.lang.*;\n" +
    75.8 +                "import groovy.lang.*;\n" +
    75.9                  "import java.util.*;\n" +
   75.10                  "import java.io.*;\n" +
   75.11 -                "import java.lang.*;\n" +
   75.12 -                "import groovy.lang.*;\n" +
   75.13                  "import java.net.*;\n" +
   75.14                  "\n" +
   75.15                  "public class Foo\n" +
   75.16                  "  extends java.lang.Object  implements\n" +
   75.17                  "    groovy.lang.GroovyObject {\n" +
   75.18 +                "public Foo() {}\n" +
   75.19                  "public java.lang.Object method1() { return null;}\n" +
   75.20                  "public java.lang.Object getClosure1() { return null;}\n" +
   75.21                  "public void setClosure1(java.lang.Object value) { }\n" +
   75.22 @@ -108,10 +109,10 @@
   75.23          CharSequence charSequence = generator.generateClass(classNodes.get(0));
   75.24          assertEquals(
   75.25                  "import groovy.util.*;\n" +
   75.26 +                "import java.lang.*;\n" +
   75.27 +                "import groovy.lang.*;\n" +
   75.28                  "import java.util.*;\n" +
   75.29                  "import java.io.*;\n" +
   75.30 -                "import java.lang.*;\n" +
   75.31 -                "import groovy.lang.*;\n" +
   75.32                  "import java.net.*;\n" +
   75.33                  "\n" +
   75.34                  "public class Test\n" +
   75.35 @@ -138,15 +139,16 @@
   75.36          CharSequence charSequence = generator.generateClass(classNodes.get(0));
   75.37          assertEquals(
   75.38                  "import groovy.util.*;\n" +
   75.39 +                "import java.lang.*;\n" +
   75.40 +                "import groovy.lang.*;\n" +
   75.41                  "import java.util.*;\n" +
   75.42                  "import java.io.*;\n" +
   75.43 -                "import java.lang.*;\n" +
   75.44 -                "import groovy.lang.*;\n" +
   75.45                  "import java.net.*;\n" +
   75.46                  "\n" +
   75.47                  "public class Foo\n" +
   75.48                  "  extends java.lang.Object  implements\n" +
   75.49                  "    groovy.lang.GroovyObject {\n" +
   75.50 +                "public Foo() {}\n" +
   75.51                  "public static java.util.List<java.lang.String> get() { return (java.util.List<java.lang.String>)null;}\n" +
   75.52                  "}\n", charSequence);
   75.53      }
   75.54 @@ -165,17 +167,19 @@
   75.55  
   75.56          GroovyVirtualSourceProvider.JavaStubGenerator generator = new GroovyVirtualSourceProvider.JavaStubGenerator();
   75.57          CharSequence charSequence = generator.generateClass(classNodes.get(0));
   75.58 -        assertEquals("import groovy.util.*;\n" +
   75.59 +        assertEquals(
   75.60 +                "import groovy.util.*;\n" +
   75.61 +                "import java.lang.*;\n" +
   75.62 +                "import groovy.lang.*;\n" +
   75.63                  "import java.util.*;\n" +
   75.64 +                "import javax.swing.*;\n" +
   75.65                  "import java.io.*;\n" +
   75.66 -                "import java.lang.*;\n" +
   75.67 -                "import javax.swing.*;\n" +
   75.68 -                "import groovy.lang.*;\n" +
   75.69                  "import java.net.*;\n" +
   75.70                  "\n" +
   75.71                  "public class MyTest\n" +
   75.72                  "  extends javax.swing.JPanel  implements\n" +
   75.73                  "    groovy.lang.GroovyObject {\n" +
   75.74 +                "public MyTest() {}\n" +
   75.75                  "public javax.swing.JPanel getPanel() { return (javax.swing.JPanel)null;}\n" +
   75.76                  "}\n", charSequence);
   75.77      }
   75.78 @@ -199,27 +203,30 @@
   75.79  
   75.80          GroovyVirtualSourceProvider.JavaStubGenerator generator = new GroovyVirtualSourceProvider.JavaStubGenerator();
   75.81          CharSequence charSequence = generator.generateClass(classNodes.get(0));
   75.82 -        assertEquals("import groovy.util.*;\n"+
   75.83 +        assertEquals(
   75.84 +                "import groovy.util.*;\n"+
   75.85 +                "import java.lang.*;\n" +
   75.86 +                "import groovy.lang.*;\n" +
   75.87                  "import java.util.*;\n" +
   75.88                  "import java.io.*;\n" +
   75.89 -                "import java.lang.*;\n" +
   75.90 -                "import groovy.lang.*;\n" +
   75.91                  "import java.net.*;\n" +
   75.92                  "\n" +
   75.93                  "public class PostService\n" +
   75.94                  "  extends java.lang.Object  implements\n" +
   75.95                  "    groovy.lang.GroovyObject {\n" +
   75.96 +                "public PostService() {}\n" +
   75.97                  "public java.lang.Object serviceMethod() throws PostException { return null;}\n" +
   75.98                  "public boolean getTransactional() { return (boolean)false;}\n" +
   75.99                  "public void setTransactional(boolean value) { }\n" +
  75.100                  "}\n", charSequence);
  75.101  
  75.102          charSequence = generator.generateClass(classNodes.get(1));
  75.103 -        assertEquals("import groovy.util.*;\n" +
  75.104 +        assertEquals(
  75.105 +                "import groovy.util.*;\n" +
  75.106 +                "import java.lang.*;\n" +
  75.107 +                "import groovy.lang.*;\n" +
  75.108                  "import java.util.*;\n" +
  75.109                  "import java.io.*;\n" +
  75.110 -                "import java.lang.*;\n" +
  75.111 -                "import groovy.lang.*;\n" +
  75.112                  "import java.net.*;\n" +
  75.113                  "\n" +
  75.114                  "public class PostException\n" +
  75.115 @@ -250,16 +257,18 @@
  75.116  
  75.117          GroovyVirtualSourceProvider.JavaStubGenerator generator = new GroovyVirtualSourceProvider.JavaStubGenerator();
  75.118          CharSequence charSequence = generator.generateClass(classNodes.get(0));
  75.119 -        assertEquals("import groovy.util.*;\n" +
  75.120 +        assertEquals(
  75.121 +                "import groovy.util.*;\n" +
  75.122 +                "import java.lang.*;\n" +
  75.123 +                "import groovy.lang.*;\n" +
  75.124                  "import java.util.*;\n" +
  75.125                  "import java.io.*;\n" +
  75.126 -                "import java.lang.*;\n" +
  75.127 -                "import groovy.lang.*;\n" +
  75.128                  "import java.net.*;\n" +
  75.129                  "\n" +
  75.130                  "public class MyTest\n" +
  75.131                  "  extends java.lang.Object  implements\n" +
  75.132                  "    groovy.lang.GroovyObject {\n" +
  75.133 +                "public MyTest() {}\n" +
  75.134                  "public void test1() throws java.lang.RuntimeException { }\n" +
  75.135                  "public void test2() throws java.lang.Exception { }\n" +
  75.136                  "public java.lang.Object test3() throws java.lang.RuntimeException { return null;}\n" +
    76.1 --- a/groovy.grails/nbproject/project.xml	Mon Nov 07 09:55:19 2011 +0100
    76.2 +++ b/groovy.grails/nbproject/project.xml	Mon Nov 07 10:48:15 2011 +0100
    76.3 @@ -160,6 +160,11 @@
    76.4                          <recursive/>
    76.5                          <compile-dependency/>
    76.6                      </test-dependency>
    76.7 +                    <test-dependency>
    76.8 +                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
    76.9 +                        <recursive/>
   76.10 +                        <compile-dependency/>
   76.11 +                    </test-dependency>
   76.12                  </test-type>
   76.13              </test-dependencies>
   76.14              <friend-packages>
    77.1 --- a/groovy.grailsproject/nbproject/project.xml	Mon Nov 07 09:55:19 2011 +0100
    77.2 +++ b/groovy.grailsproject/nbproject/project.xml	Mon Nov 07 10:48:15 2011 +0100
    77.3 @@ -332,6 +332,11 @@
    77.4                          <compile-dependency/>
    77.5                      </test-dependency>
    77.6                      <test-dependency>
    77.7 +                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
    77.8 +                        <recursive/>
    77.9 +                        <compile-dependency/>
   77.10 +                    </test-dependency>
   77.11 +                    <test-dependency>
   77.12                          <code-name-base>org.netbeans.modules.projectui</code-name-base>
   77.13                          <compile-dependency/>
   77.14                      </test-dependency>
    78.1 --- a/groovy.gsp/nbproject/project.xml	Mon Nov 07 09:55:19 2011 +0100
    78.2 +++ b/groovy.gsp/nbproject/project.xml	Mon Nov 07 10:48:15 2011 +0100
    78.3 @@ -303,6 +303,11 @@
    78.4                          <recursive/>
    78.5                      </test-dependency>
    78.6                      <test-dependency>
    78.7 +                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
    78.8 +                        <recursive/>
    78.9 +                        <compile-dependency/>
   78.10 +                    </test-dependency>
   78.11 +                    <test-dependency>
   78.12                          <code-name-base>org.openide.filesystems</code-name-base>
   78.13                          <recursive/>
   78.14                      </test-dependency>