Allow importing project that contains existing project directory #5211
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
brian-mcnamara
requested review from
mai93,
jastice and
tpasternak
as code owners
github-actions
bot
added
product: Android Studio
brian-mcnamara
force-pushed
the
projectTemplate
branch
2 times, most recently
from
7c4f351
to
305e6a1
Compare
|
More and more I think about this, I feel like I may be missing something that exists. We checkin files under .idea for reasons mentioned above, and I'd be surprised if users of bazel do not have some way of sharing/managing settings. Let me know if I'm missing something |
| public @Nullable Project createProject(String name, String path) { | ||
| //Allows checked in files to be used. createProject deletes the directory. | ||
| if (new File(path, Project.DIRECTORY_STORE_FOLDER).exists()) { | ||
| return ProjectManagerEx.getInstanceEx().loadProject(Path.of(path)); |
There was a problem hiding this comment.
what if existing project is incomplete?
brian-mcnamara
force-pushed
the
projectTemplate
branch
from
305e6a1
to
f205c9b
Compare
| if (workspaceIdeaDir.exists() && workspaceIdeaDir.isDirectory()) { | ||
| Path bazelProjectPath = currentPath.resolve(Project.DIRECTORY_STORE_FOLDER); | ||
| try { | ||
| FileUtil.copyDirContent(workspaceIdeaDir, bazelProjectPath.toFile()); |
There was a problem hiding this comment.
Can we make this conditional based on some registry value to not happen for everyone from now on?
There was a problem hiding this comment.
I was debating it...
| @@ -43,4 +57,31 @@ public List<Module> commit( | |||
| public BlazeNewProjectBuilder builder() { | |||
| return builder; | |||
| } | |||
|
|
|||
| @Override | |||
| public @Nullable Project createProject(String name, String path) { | |||
There was a problem hiding this comment.
Will this be called on Auto Import?
|
@brian-mcnamara could you please make sure that checks are not failing? |
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.
This change prevents deleting the .ijwb/.idea directory when importing the project. This is useful for cases where the project checks-in the project files to VCS. Examples where this is useful are copyright configuration, VCS settings, code style among others.
One thing to note, loadProject is marked as @internal.