Merge master #10
Merged
Merge master #10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
double the 'testingStarted' message, because the first one is ignored Merge-request: BAZEL-MR-990 Merged-by: Katarzyna Mielnik <katarzyna.mielnik@jetbrains.com>
…ound to calculate the package prefix | #BAZEL-910 Done Merge-request: BAZEL-MR-987 Merged-by: Xuan Son Trinh <xuanson.trinh@jetbrains.com>
…EL-918 Done Merge-request: BAZEL-MR-1000 Merged-by: Xuan Son Trinh <xuanson.trinh@jetbrains.com>
…BAZEL-904 Done Merge-request: BAZEL-MR-993 Merged-by: Marcin Abramowicz <marcin.abramowicz@jetbrains.com>
…y `ExternalSystemUnlinkedProjectAware` api | #BAZEL-888 Merge-request: BAZEL-MR-1006 Merged-by: Marcin Abramowicz <marcin.abramowicz@jetbrains.com>
….net.URI#create` | #BAZEL-913 Done - Also log error out before finishing erroneous tasks with `TaskConsole`. Merge-request: BAZEL-MR-991 Merged-by: Xuan Son Trinh <xuanson.trinh@jetbrains.com>
The function for finding the modules was flawed because the modules are named differently in intellij-bazel, besides, we can use the workspace model anyway Merge-request: BAZEL-MR-1008 Merged-by: Lev Leontev <lev.leontev@jetbrains.com>
Merge-request: BAZEL-MR-1009 Merged-by: Lev Leontev <lev.leontev@jetbrains.com>
…alSystemUnlinkedProjectAware` api | #BAZEL-888 imports different organization of the code [fix] target widget works for projects which were imported by `ExternalSystemUnlinkedProjectAware` api Merge-request: BAZEL-MR-1010 Merged-by: Marcin Abramowicz <marcin.abramowicz@jetbrains.com>
…roject structure | #BAZEL-923 Merge-request: BAZEL-MR-1014 Merged-by: Xuan Son Trinh <xuanson.trinh@jetbrains.com>
Merge-request: BAZEL-MR-1020 Merged-by: Xuan Son Trinh <xuanson.trinh@jetbrains.com>
Merge-request: BAZEL-MR-879 Merged-by: Andrzej Gluszak <Andrzej.Gluszak@jetbrains.com>
Merge-request: BAZEL-MR-1021 Merged-by: Lev Leontev <lev.leontev@jetbrains.com>
… for all libraries | #BAZEL-931 Done Merge-request: BAZEL-MR-1025 Merged-by: Xuan Son Trinh <xuanson.trinh@jetbrains.com>
Merge-request: BAZEL-MR-1031 Merged-by: Danil Tereshchenko <Danil.Tereshchenko@jetbrains.com>
…/debugging Android targets Merge-request: BAZEL-MR-1027 Merged-by: Lev Leontev <lev.leontev@jetbrains.com>
Merge-request: BAZEL-MR-1028 Merged-by: Lev Leontev <lev.leontev@jetbrains.com>
…l of unused method Merge-request: BAZEL-MR-1035 Merged-by: Marcin Abramowicz <marcin.abramowicz@jetbrains.com>
Merge-request: BAZEL-MR-1037 Merged-by: Danil Tereshchenko <Danil.Tereshchenko@jetbrains.com>
…tate save Merge-request: BAZEL-MR-1034 Merged-by: Marcin Abramowicz <marcin.abramowicz@jetbrains.com>
….0.0-beta1 add pluginVerifier() dependency update gradle plugin to 2.0.0-beta1 change task :runPluginVerifier to :verifyPlugin Merge-request: BAZEL-MR-1038 Merged-by: Danil Tereshchenko <Danil.Tereshchenko@jetbrains.com>
Merge-request: BAZEL-MR-1041 Merged-by: Xuan Son Trinh <xuanson.trinh@jetbrains.com>
… to be in line with BSP Merge-request: BAZEL-MR-1044 Merged-by: Lev Leontev <lev.leontev@jetbrains.com>
…ource roots Merge-request: BAZEL-MR-1046 Merged-by: Xuan Son Trinh <xuanson.trinh@jetbrains.com>
…ents Merge-request: BAZEL-MR-1051 Merged-by: Xuan Son Trinh <xuanson.trinh@jetbrains.com>
…m to ui/actions make fillWithEligibleActions public make jvm actions public, move load actions, fix method visibility make RunTargetAction, TestTargetAction and BuildTargetAction public, move to a less specific dir Merge-request: BAZEL-MR-1053 Merged-by: Katarzyna Mielnik <katarzyna.mielnik@jetbrains.com>
…5989.69`) Merge-request: BAZEL-MR-1059 Merged-by: Xuan Son Trinh <xuanson.trinh@jetbrains.com>
The existing metric `apply-changes-on-workspace-model` that measures the `applyOnWorkspaceModel` function may be not representative in the details of what kind of wait do we have. This metric can be split in three: 1) Apply `replaceBySource` 2) Waiting for the write action 3) Apply workspace model With this change we'll add time tracking for 1 and 3. Write action await can be calculated, but not explicitly measured. Also, it's important to understand that 3 happens under write lock, thus causes freezez This change is a part of BAZEL-317
… from a real module | #BAZEL-954 Done Merge-request: BAZEL-MR-1067 Merged-by: Xuan Son Trinh <xuanson.trinh@jetbrains.com>
Merge-request: BAZEL-MR-1072 Merged-by: Xuan Son Trinh <xuanson.trinh@jetbrains.com>
whole connection details [maintenance] server version log Merge-request: BAZEL-MR-1076 Merged-by: Marcin Abramowicz <marcin.abramowicz@jetbrains.com>
…ate long module/library name issue | #BAZEL-957 Merge-request: BAZEL-MR-1078 Merged-by: Xuan Son Trinh <xuanson.trinh@jetbrains.com>
…ry names | #BAZEL-957 Merge-request: BAZEL-MR-1083 Merged-by: Xuan Son Trinh <xuanson.trinh@jetbrains.com>
Merge-request: BAZEL-MR-1085 Merged-by: Xuan Son Trinh <xuanson.trinh@jetbrains.com>
…d on its name | #BAZEL-957
…dle the case of overridden library versions | #BAZEL-983
# Conflicts: # buildSrc/src/main/kotlin/versions.kt # src/main/kotlin/org/jetbrains/plugins/bsp/magicmetamodel/impl/MagicMetaModelImpl.kt # src/main/kotlin/org/jetbrains/plugins/bsp/magicmetamodel/impl/TargetIdToModuleEntitiesMap.kt # src/main/kotlin/org/jetbrains/plugins/bsp/magicmetamodel/impl/workspacemodel/WorkspaceModelToModulesMapTransformer.kt # src/main/kotlin/org/jetbrains/plugins/bsp/magicmetamodel/impl/workspacemodel/impl/WorkspaceModelUpdaterImpl.kt # src/main/kotlin/org/jetbrains/plugins/bsp/server/tasks/CollectProjectDetailsTask.kt # src/main/kotlin/org/jetbrains/plugins/bsp/ui/gutters/BspJVMRunLineMarkerContributor.kt # src/main/resources/META-INF/plugin.xml
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.