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

Fixes for additional content roots in workspace model #2076

Merged
merged 5 commits into from
Apr 23, 2021

Conversation

citizenmatt
Copy link
Member

This PR will:

  • Only add Unity specific folders to the content model for a Unity project. This is especially important for <project-root>/Packages
  • Reset the extra folders and includes/excludes in the content model stored in indexLayout.xml by previous versions. The upgrade flag is stored in global config, keyed with the hash of the .idea path

@citizenmatt citizenmatt requested a review from xtmq April 20, 2021 16:31
@citizenmatt citizenmatt self-assigned this Apr 20, 2021
val projectDir = dotIdeaDir.parent?.parent?.parent?.toFile()?.toVirtualFile(true) ?: return emptyArray()
if (!UnityProjectDiscoverer.hasUnityFileStructure(projectDir)) return emptyArray()

PropertiesComponent.getInstance().setValue(key, dotIdeaDir.toString())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

setValue(..., true) maybe instead of full path? just a flag

@citizenmatt citizenmatt force-pushed the net211-mte-workspace-model-fixes branch from b7f35e4 to 4575ece Compare April 20, 2021 17:34
@citizenmatt citizenmatt added this to the Rider 2021.1.3 milestone Apr 20, 2021
@citizenmatt citizenmatt merged commit e0226a3 into net211 Apr 23, 2021
@citizenmatt citizenmatt deleted the net211-mte-workspace-model-fixes branch April 23, 2021 15:38
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.

None yet

2 participants