Intellij fights with itself over iml files

[abarth]

I tried setting the iml files to a reasonable value, but each of my machines has a different idea what it wants these files to hold.

diff --git a/examples/flutter_gallery/flutter_gallery.iml b/examples/flutter_gallery/flutter_gallery.iml
index 802d866..3a913c2 100644
--- a/examples/flutter_gallery/flutter_gallery.iml
+++ b/examples/flutter_gallery/flutter_gallery.iml
@@ -4,7 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/build" />
-      <excludeFolder url="file://$MODULE_DIR$/packages/flutter_gallery" />
+      <excludeFolder url="file://$MODULE_DIR$/packages" />
       <excludeFolder url="file://$MODULE_DIR$/test/calculator/packages" />
       <excludeFolder url="file://$MODULE_DIR$/test/packages" />
     </content>
diff --git a/examples/hello_world/hello_world.iml b/examples/hello_world/hello_world.iml
index 2258678..8b7ff15 100644
--- a/examples/hello_world/hello_world.iml
+++ b/examples/hello_world/hello_world.iml
@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
-      <excludeFolder url="file://$MODULE_DIR$/packages/hello_world" />
+      <excludeFolder url="file://$MODULE_DIR$/packages" />
       <excludeFolder url="file://$MODULE_DIR$/test/packages" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/packages/flutter/flutter.iml b/packages/flutter/flutter.iml
index b6bfb1c..0510f57 100644
--- a/packages/flutter/flutter.iml
+++ b/packages/flutter/flutter.iml
@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/bin/packages" />
-      <excludeFolder url="file://$MODULE_DIR$/packages/flutter" />
+      <excludeFolder url="file://$MODULE_DIR$/packages" />
       <excludeFolder url="file://$MODULE_DIR$/test/animation/packages" />
       <excludeFolder url="file://$MODULE_DIR$/test/cassowary/packages" />
       <excludeFolder url="file://$MODULE_DIR$/test/engine/packages" />
diff --git a/packages/flutter_driver/flutter_driver.iml b/packages/flutter_driver/flutter_driver.iml
index 5bca37d..1fa9806 100644
--- a/packages/flutter_driver/flutter_driver.iml
+++ b/packages/flutter_driver/flutter_driver.iml
@@ -4,7 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/packages/flutter_driver" />
+      <excludeFolder url="file://$MODULE_DIR$/packages" />
       <excludeFolder url="file://$MODULE_DIR$/test/packages" />
       <excludeFolder url="file://$MODULE_DIR$/test/src/packages" />
     </content>
diff --git a/packages/flutter_markdown/flutter_markdown.iml b/packages/flutter_markdown/flutter_markdown.iml
index 162f9c5..2ae0251 100644
--- a/packages/flutter_markdown/flutter_markdown.iml
+++ b/packages/flutter_markdown/flutter_markdown.iml
@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/example/packages" />
-      <excludeFolder url="file://$MODULE_DIR$/packages/flutter_markdown" />
+      <excludeFolder url="file://$MODULE_DIR$/packages" />
       <excludeFolder url="file://$MODULE_DIR$/test/packages" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/packages/flutter_test/flutter_test.iml b/packages/flutter_test/flutter_test.iml
index 216a82f..a2f4fdd 100644
--- a/packages/flutter_test/flutter_test.iml
+++ b/packages/flutter_test/flutter_test.iml
@@ -4,7 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/packages/flutter_test" />
+      <excludeFolder url="file://$MODULE_DIR$/packages" />
       <excludeFolder url="file://$MODULE_DIR$/test/packages" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/packages/flutter_tools/flutter_tools.iml b/packages/flutter_tools/flutter_tools.iml
index a4712ec..2ccd7bc 100644
--- a/packages/flutter_tools/flutter_tools.iml
+++ b/packages/flutter_tools/flutter_tools.iml
@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/bin/packages" />
-      <excludeFolder url="file://$MODULE_DIR$/packages/flutter_tools" />
+      <excludeFolder url="file://$MODULE_DIR$/packages" />
       <excludeFolder url="file://$MODULE_DIR$/test/packages" />
       <excludeFolder url="file://$MODULE_DIR$/test/src/ios/packages" />
       <excludeFolder url="file://$MODULE_DIR$/test/src/packages" />

[devoncarew]

Does running flutter update-packages --upgrade normalize it at all? I would expect that some (all?) of those packages dirs should go away with pub upgrade --no-packages-dir.

[abarth]

I'll need to run some experiments.

[alexander-doroshko]

This is actually caused by the Dart plugin. Exclusion list depends on the Dart SDK version configured in the IDE (even if Dart support is disabled for the current project). Difference happens because in case of SDK older than 1.12 root packages folder is not excluded, but some of its subfolders are. In case of SDK 1.12+ root packages is excluded. Dart plugin treats no SDK the same as 1.11-. I'll fix it at Dart plugin side, since we are not interested too much in older SDKs support.

So 'the correct' IML is where "file://$MODULE_DIR$/packages" is excluded, the incorrect one is with "file://$MODULE_DIR$/packages/flutter_tools" and similar.

Workaround is to configure any fresh Dart SDK in Preferences | Languages and Frameworks | Dart, enable it, Apply and disable again if not needed.

Sorry for inconvenience.

[abarth]

Thanks!

[pq]

@devoncarew : it looks like the IML files can be safely updated in the repo. Tentatively bouncing to you since you did the first round. Feel free to reassign as you see fit!

[abarth]

I pushed the updated IML files to flutter.git.

[pq]

Awesome. Thanks @abarth !

Optimistically closing...

[abarth]

Now we're fighting over .pub folders.

diff --git a/examples/hello_world/hello_world.iml b/examples/hello_world/hello_world.iml
index 78a245f..8b7ff15 100644
--- a/examples/hello_world/hello_world.iml
+++ b/examples/hello_world/hello_world.iml
@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/packages" />
       <excludeFolder url="file://$MODULE_DIR$/test/packages" />
diff --git a/packages/flutter/flutter.iml b/packages/flutter/flutter.iml
index e50331f..0510f57 100644
--- a/packages/flutter/flutter.iml
+++ b/packages/flutter/flutter.iml
@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/bin/packages" />
       <excludeFolder url="file://$MODULE_DIR$/packages" />
       <excludeFolder url="file://$MODULE_DIR$/test/animation/packages" />
diff --git a/packages/flutter_driver/flutter_driver.iml b/packages/flutter_driver/flutter_driver.iml
index c88753f..1fa9806 100644
--- a/packages/flutter_driver/flutter_driver.iml
+++ b/packages/flutter_driver/flutter_driver.iml
@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/packages" />
       <excludeFolder url="file://$MODULE_DIR$/test/packages" />
       <excludeFolder url="file://$MODULE_DIR$/test/src/packages" />
diff --git a/packages/flutter_markdown/flutter_markdown.iml b/packages/flutter_markdown/flutter_markdown.iml
index cbcc56c..2ae0251 100644
--- a/packages/flutter_markdown/flutter_markdown.iml
+++ b/packages/flutter_markdown/flutter_markdown.iml
@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/example/packages" />
       <excludeFolder url="file://$MODULE_DIR$/packages" />
       <excludeFolder url="file://$MODULE_DIR$/test/packages" />
diff --git a/packages/flutter_test/flutter_test.iml b/packages/flutter_test/flutter_test.iml
index 20208e6..a2f4fdd 100644
--- a/packages/flutter_test/flutter_test.iml
+++ b/packages/flutter_test/flutter_test.iml
@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/packages" />
       <excludeFolder url="file://$MODULE_DIR$/test/packages" />
     </content>

[alexander-doroshko]

It's ok to commit excluded .pub folders. You won't have conflcts caused by IDE wanting to unexclude them.

[pq]

Thanks @alexander-doroshko.

cc @devoncarew