Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master to WebStorm #1120

Merged
merged 39 commits into from
Jul 30, 2019
Merged

Merge master to WebStorm #1120

merged 39 commits into from
Jul 30, 2019

Conversation

zhangzhx
Copy link
Contributor

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)

Description

Motivation and Context

Related Issue(s)

Testing

Screenshots (if appropriate)

Checklist

  • I have read the README document
  • I have read the CONTRIBUTING document
  • Local run of gradlew check succeeds
  • My code follows the code style of this project
  • I have added tests to cover my changes
  • All new and existing tests passed
  • A short description of the change has been added to the CHANGELOG

License

I confirm that my contribution is made under the terms of the Apache 2.0 license.

abrooksv and others added 30 commits July 30, 2019 11:11
* Fix the refresh vfs in ReadAction bug.
* Use sam build folder to avoid recursive copying.
…button (#896)

* Resolve some TODOs to simplify the LambdaBuilder logic
* Make sure all exceptions get mapped into CompletableFuture.completeExceptionally
#1056)

* Enable using the presence of a requirements.txt to determine if a method is a handler in Python

* This allows us to not rely on source roots but instead matches what SAM build will do, which is look for the requirements.txt at the codeUri location
* Fix broken test that had incorrect assertion and behavior
* Fix tests not testing the correct things
* It kept having aliasing issues related to editing a cloned run config
* It kept us from 192 due to NoSuchMethod error
…#1077)

- Fix exception on startup while gathering SAM CLI information; replace synchronous execution on EDT with modifying project model after project is initialized
- Fix validation for template.yaml file to be able to call SAM deploy action
- Fix sync calls on run configuration validation to use async calls
- Add tests to verify SamVersion evaluation and getFileInfo logic
…ck (#1079)

* Move test back to unit test package
* Make FileInfoCache async based
* Move logic up from SAM version cache to FileInfoCache
* Tweak the evaluateBlocking to throw if not successful
* Move tests around and update to match the current state of the world
* This allows tests to run with Java 11 or Java 8
* Refresh Vfs after project is updated from SAM CLI to sync it with File System
* WriteAction is not necessary while SAM project is generated since there is no interaction with VFS. We refresh VFS after files are copied.
* Revert "Revert "Enable toolkit in 192 (#1000)" (#1007)"

This reverts commit fcdfa2c.

* Remove warning around state variable name
* Make sure Java lambdas tests compile as 1.8
* Fix incompatible plugin versions
* Suppress and comment deprecation
* Fix SAM SemVer tests since now 192 cares about things after the patch version
* Add test artifact saving for linux-based CI jobs
* No functional changes were made
abrooksv and others added 9 commits July 30, 2019 11:25
* Fix the ui tests since 192 changes JBTabs to a brand new system
* In 192, we were showing that we were triggering reentrant indexing. Since we only use this for Java handler completion, we will remove it.
* Add library test in Gradle UI test and change the importing behavior to background async.
…1110)

* JetBrain's Invoker is forced to run under a read action, fork the Invoker and AsyncTreeModel (and supporting classes) to remove that requirement
* Increase min version to drop 183 EAP builds, implement abstract method that wasnt implemented in earlier versions
@zhangzhx zhangzhx requested a review from a team as a code owner July 30, 2019 20:24
@codecov-io
Copy link

codecov-io commented Jul 30, 2019

Codecov Report

Merging #1120 into feature/webstorm-support will increase coverage by 1.51%.
The diff coverage is 47.05%.

Impacted file tree graph

@@                      Coverage Diff                       @@
##             feature/webstorm-support    #1120      +/-   ##
==============================================================
+ Coverage                       44.21%   45.72%   +1.51%     
- Complexity                        546      662     +116     
==============================================================
  Files                             172      187      +15     
  Lines                            5625     7127    +1502     
  Branches                          729      975     +246     
==============================================================
+ Hits                             2487     3259     +772     
- Misses                           2897     3509     +612     
- Partials                          241      359     +118
Flag Coverage Δ Complexity Δ
#unittest 45.72% <47.05%> (+1.51%) 662 <160> (+116) ⬆️
Impacted Files Coverage Δ Complexity Δ
...etbrains/core/explorer/AwsExplorerTreeStructure.kt 0% <ø> (ø) 0 <0> (ø) ⬇️
...ts/jetbrains/services/lambda/LambdaBuilderUtils.kt 10% <ø> (+0.9%) 2 <0> (ø) ⬇️
...ftware/aws/toolkits/jetbrains/ui/RegionSelector.kt 0% <ø> (ø) 0 <0> (ø) ⬇️
...olkits/jetbrains/services/lambda/sam/SamOptions.kt 100% <ø> (ø) 4 <0> (+3) ⬆️
...ws/toolkits/jetbrains/core/DeleteResourceAction.kt 0% <ø> (ø) 0 <0> (ø) ⬇️
.../jetbrains/core/explorer/AwsExplorerTreeBuilder.kt 0% <ø> (ø) 0 <0> (ø) ⬇️
...rc/software/aws/toolkits/core/region/Partitions.kt 69.23% <ø> (+3.84%) 2 <0> (ø) ⬇️
...ices/cloudformation/CloudFormationTemplateIndex.kt 92.98% <ø> (+1.14%) 9 <0> (ø) ⬇️
...oolkits/jetbrains/core/explorer/AbstractActions.kt 0% <ø> (ø) 0 <0> (ø) ⬇️
...ains/services/lambda/upload/EditFunctionPanel.java 100% <ø> (ø) 5 <0> (ø) ⬇️
... and 188 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ce5ec2e...51619b3. Read the comment docs.

@zhangzhx zhangzhx mentioned this pull request Jul 30, 2019
@kiiadi kiiadi merged commit 579c54e into feature/webstorm-support Jul 30, 2019
@kiiadi kiiadi deleted the zhaoxiz-mergeMaster branch August 20, 2019 05:50
Will-ShaoHua added a commit to Will-ShaoHua/aws-toolkit-jetbrains that referenced this pull request Mar 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants