From 24f1b2ee099fd3f9a09b3cfba71462e919899346 Mon Sep 17 00:00:00 2001
From: Michael Thomsen <mit-mit@users.noreply.github.com>
Date: Mon, 23 Jan 2017 16:33:18 +0100
Subject: [PATCH] Update IntelliJ template for new projects and existing
 samples (#7501)

* Disable 'Show Excluded' by default

* Move .iml file inside .idea dir

* Remove pub and build excludions as they are automatically set by the Dart plugin

* Exclude .idea folder (new users will edit it through the IJ UI, not the file)

* Move .iml files into .idea dir to be consistent with template changes

* Add workspace.xml from new template to existing samples

* Update current examples to match template changes for excluding folders

* Add missing flutter.yaml to make sure there are no analysis errors

* Add back .pub and build excludeFolder tags per https://github.com/flutter/flutter-intellij/issues/630#issuecomment-272887230

* Remove workspace.xml from example per review feedback
---
 .idea/modules.xml                                          | 4 ++--
 examples/flutter_gallery/{ => .idea}/flutter_gallery.iml   | 1 +
 examples/flutter_gallery/.idea/modules.xml                 | 2 +-
 examples/hello_services/{ => .idea}/hello_services.iml     | 1 +
 examples/hello_services/.idea/modules.xml                  | 2 +-
 examples/hello_world/{ => .idea}/hello_world.iml           | 1 +
 examples/hello_world/.idea/modules.xml                     | 2 +-
 examples/hello_world/flutter.yaml                          | 2 ++
 examples/layers/{ => .idea}/layers.iml                     | 1 +
 examples/layers/.idea/modules.xml                          | 2 +-
 examples/stocks/.idea/modules.xml                          | 2 +-
 examples/stocks/{ => .idea}/stocks.iml                     | 1 +
 .../flutter_tools/templates/create/.idea/modules.xml.tmpl  | 2 +-
 .../templates/create/{ => .idea}/projectName.iml.tmpl      | 1 +
 .../templates/create/.idea/workspace.xml.tmpl              | 7 +++++++
 15 files changed, 23 insertions(+), 8 deletions(-)
 rename examples/flutter_gallery/{ => .idea}/flutter_gallery.iml (93%)
 rename examples/hello_services/{ => .idea}/hello_services.iml (91%)
 rename examples/hello_world/{ => .idea}/hello_world.iml (92%)
 create mode 100644 examples/hello_world/flutter.yaml
 rename examples/layers/{ => .idea}/layers.iml (92%)
 rename examples/stocks/{ => .idea}/stocks.iml (92%)
 rename packages/flutter_tools/templates/create/{ => .idea}/projectName.iml.tmpl (91%)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index e1cd55b0c0..41697c5943 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,11 +5,11 @@
       <module fileurl="file://$PROJECT_DIR$/dev/devicelab/devicelab.iml" filepath="$PROJECT_DIR$/dev/devicelab/devicelab.iml" />
       <module fileurl="file://$PROJECT_DIR$/packages/flutter/flutter.iml" filepath="$PROJECT_DIR$/packages/flutter/flutter.iml" />
       <module fileurl="file://$PROJECT_DIR$/packages/flutter_driver/flutter_driver.iml" filepath="$PROJECT_DIR$/packages/flutter_driver/flutter_driver.iml" />
-      <module fileurl="file://$PROJECT_DIR$/examples/flutter_gallery/flutter_gallery.iml" filepath="$PROJECT_DIR$/examples/flutter_gallery/flutter_gallery.iml" />
+      <module fileurl="file://$PROJECT_DIR$/examples/flutter_gallery/.idea/flutter_gallery.iml" filepath="$PROJECT_DIR$/examples/flutter_gallery/.idea/flutter_gallery.iml" />
       <module fileurl="file://$PROJECT_DIR$/packages/flutter_markdown/flutter_markdown.iml" filepath="$PROJECT_DIR$/packages/flutter_markdown/flutter_markdown.iml" />
       <module fileurl="file://$PROJECT_DIR$/packages/flutter_test/flutter_test.iml" filepath="$PROJECT_DIR$/packages/flutter_test/flutter_test.iml" />
       <module fileurl="file://$PROJECT_DIR$/packages/flutter_tools/flutter_tools.iml" filepath="$PROJECT_DIR$/packages/flutter_tools/flutter_tools.iml" />
-      <module fileurl="file://$PROJECT_DIR$/examples/hello_world/hello_world.iml" filepath="$PROJECT_DIR$/examples/hello_world/hello_world.iml" />
+      <module fileurl="file://$PROJECT_DIR$/examples/hello_world/.idea/hello_world.iml" filepath="$PROJECT_DIR$/examples/hello_world/.idea/hello_world.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/examples/flutter_gallery/flutter_gallery.iml b/examples/flutter_gallery/.idea/flutter_gallery.iml
similarity index 93%
rename from examples/flutter_gallery/flutter_gallery.iml
rename to examples/flutter_gallery/.idea/flutter_gallery.iml
index 3e9be65925..702d05278f 100644
--- a/examples/flutter_gallery/flutter_gallery.iml
+++ b/examples/flutter_gallery/.idea/flutter_gallery.iml
@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.idea" />
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/packages" />
diff --git a/examples/flutter_gallery/.idea/modules.xml b/examples/flutter_gallery/.idea/modules.xml
index 180cda925d..666a525523 100644
--- a/examples/flutter_gallery/.idea/modules.xml
+++ b/examples/flutter_gallery/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/flutter_gallery.iml" filepath="$PROJECT_DIR$/flutter_gallery.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/flutter_gallery.iml" filepath="$PROJECT_DIR$/.idea/flutter_gallery.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/examples/hello_services/hello_services.iml b/examples/hello_services/.idea/hello_services.iml
similarity index 91%
rename from examples/hello_services/hello_services.iml
rename to examples/hello_services/.idea/hello_services.iml
index 6c95b1bc45..c4447024fe 100644
--- a/examples/hello_services/hello_services.iml
+++ b/examples/hello_services/.idea/hello_services.iml
@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.idea" />
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/packages" />
diff --git a/examples/hello_services/.idea/modules.xml b/examples/hello_services/.idea/modules.xml
index cb7dabc417..328fb20245 100644
--- a/examples/hello_services/.idea/modules.xml
+++ b/examples/hello_services/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/hello_services.iml" filepath="$PROJECT_DIR$/hello_services.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/hello_services.iml" filepath="$PROJECT_DIR$/.idea/hello_services.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/examples/hello_world/hello_world.iml b/examples/hello_world/.idea/hello_world.iml
similarity index 92%
rename from examples/hello_world/hello_world.iml
rename to examples/hello_world/.idea/hello_world.iml
index 93713a9949..a9c4f5568f 100644
--- a/examples/hello_world/hello_world.iml
+++ b/examples/hello_world/.idea/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$/.idea" />
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/packages" />
diff --git a/examples/hello_world/.idea/modules.xml b/examples/hello_world/.idea/modules.xml
index 6c4ef6201e..3e68d82ce5 100644
--- a/examples/hello_world/.idea/modules.xml
+++ b/examples/hello_world/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/hello_world.iml" filepath="$PROJECT_DIR$/hello_world.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/hello_world.iml" filepath="$PROJECT_DIR$/.idea/hello_world.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/examples/hello_world/flutter.yaml b/examples/hello_world/flutter.yaml
new file mode 100644
index 0000000000..d668b442c3
--- /dev/null
+++ b/examples/hello_world/flutter.yaml
@@ -0,0 +1,2 @@
+name: hello_world
+uses-material-design: true
diff --git a/examples/layers/layers.iml b/examples/layers/.idea/layers.iml
similarity index 92%
rename from examples/layers/layers.iml
rename to examples/layers/.idea/layers.iml
index 93713a9949..a9c4f5568f 100644
--- a/examples/layers/layers.iml
+++ b/examples/layers/.idea/layers.iml
@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.idea" />
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/packages" />
diff --git a/examples/layers/.idea/modules.xml b/examples/layers/.idea/modules.xml
index ec44738db8..f61dd524eb 100644
--- a/examples/layers/.idea/modules.xml
+++ b/examples/layers/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/layers.iml" filepath="$PROJECT_DIR$/layers.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/layers.iml" filepath="$PROJECT_DIR$/.idea/layers.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/examples/stocks/.idea/modules.xml b/examples/stocks/.idea/modules.xml
index ac48f7b645..fb2ea5b2a5 100644
--- a/examples/stocks/.idea/modules.xml
+++ b/examples/stocks/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/stocks.iml" filepath="$PROJECT_DIR$/stocks.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/stocks.iml" filepath="$PROJECT_DIR$/.idea/stocks.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/examples/stocks/stocks.iml b/examples/stocks/.idea/stocks.iml
similarity index 92%
rename from examples/stocks/stocks.iml
rename to examples/stocks/.idea/stocks.iml
index 93713a9949..a9c4f5568f 100644
--- a/examples/stocks/stocks.iml
+++ b/examples/stocks/.idea/stocks.iml
@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.idea" />
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/packages" />
diff --git a/packages/flutter_tools/templates/create/.idea/modules.xml.tmpl b/packages/flutter_tools/templates/create/.idea/modules.xml.tmpl
index 7488ebe80d..d37e9c9e1a 100644
--- a/packages/flutter_tools/templates/create/.idea/modules.xml.tmpl
+++ b/packages/flutter_tools/templates/create/.idea/modules.xml.tmpl
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/{{projectName}}.iml" filepath="$PROJECT_DIR$/{{projectName}}.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/{{projectName}}.iml" filepath="$PROJECT_DIR$/.idea/{{projectName}}.iml" />
     </modules>
   </component>
 </project>
diff --git a/packages/flutter_tools/templates/create/projectName.iml.tmpl b/packages/flutter_tools/templates/create/.idea/projectName.iml.tmpl
similarity index 91%
rename from packages/flutter_tools/templates/create/projectName.iml.tmpl
rename to packages/flutter_tools/templates/create/.idea/projectName.iml.tmpl
index 6c95b1bc45..c4447024fe 100644
--- a/packages/flutter_tools/templates/create/projectName.iml.tmpl
+++ b/packages/flutter_tools/templates/create/.idea/projectName.iml.tmpl
@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.idea" />
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/packages" />
diff --git a/packages/flutter_tools/templates/create/.idea/workspace.xml.tmpl b/packages/flutter_tools/templates/create/.idea/workspace.xml.tmpl
index b6f518ba13..1e7e0cd929 100644
--- a/packages/flutter_tools/templates/create/.idea/workspace.xml.tmpl
+++ b/packages/flutter_tools/templates/create/.idea/workspace.xml.tmpl
@@ -19,4 +19,11 @@
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
     </layout>
   </component>
+  <component name="ProjectView">
+    <panes>
+      <pane id="ProjectPane">
+        <option name="show-excluded-files" value="false" />
+      </pane>
+    </panes>
+  </component>
 </project>