Hot reload control

.gitignore

@@ -13,3 +13,5 @@ pubspec.lock
 .idea/
 .vscode/
 material-design-icons/
+flutter-gui-tests/guitest.log
+flutter-gui-tests/.gradle/

.travis.yml

@@ -28,7 +28,6 @@ script: ./tool/travis.sh
 env:
   - DART_BOT=true
   - CHECK_BOT=true
-  - IDEA_VERSION=3.3
+  - IDEA_VERSION=3.3.2
   - IDEA_VERSION=3.4
-  - IDEA_VERSION=2018.3
-  - IDEA_VERSION=2019.1
+  - IDEA_VERSION=3.5

CHANGELOG.md

@@ -1,3 +1,85 @@
+## 35.0
+- Sample panel layout improvements (#3396)
+- Remove unneeded logging (#3394)
+- Java analysis lints cleanup (#3395)
+- Update subscriptions after analysis server restart (#3393)
+- Read sample index from flutter_tool call (#3379)
+- Update README (#3387)
+- Fix unit tests
+- Update build for canary 11 (#3380)
+- Integration test update (#3374)
+- Make the inspector easier to test (#3373)
+- Adjust build to make plugin for testing (#3366)
+- Address reported Java lints (#3356)
+- Adjust build for AS canary 10
+- Address an array index out of bounds (#3355)
+- Address an NPE (#3354)
+- Upgrade the service protocol library (#3353)
+- Address a number format exception (#3352)
+- Update how we manipulate the service protocol url (#3351)
+- Remove some uses of reflection (#3350)
+- Some initial work for FlutterWeb apps (#3342)
+- Fix an NPE when sample content generation is disabled (#3336)
+- Add inspector dependency to test (#3316)
+- Make Dart constructor calls pop out in light mode  (#3327)
+
+## 34.0
+- Update build for Android Studio 3.3.2 and IntelliJ 2019.1 (#3321)
+- Fix issue preventing plugin from working in AS Canary 8 (#3321)
+- Provides a better display if the variable has a `toStringDeep()` method defined. (#3291)
+- Don't show a background square in the inspector summary tree. (#3326)
+- Make FlutterModuleUtils consistently robust to disposed projects. (#3323)
+- Fix NPE issue sometimes hit evaluating expressions. (#3324)
+- Fix widget names. (#3322)
+- Make Perf and Inspector views only display when a Flutter app is being debugged. (#3320)
+- Support the inspector for flutter_web libraries. (#3310)
+- Detect when integrations tests are running (#3308)
+- Add in support for reloading and restarting all running apps (#3268)
+- Log tree path selection fixes (#3302)
+- Throttle logger updates (#3280)
+- New method in FlutterUtils: declaresFlutterWeb, this method checks for dependencies: fluttler_web in a pubspec file. (#3275)
+- Update a comment in FlutterSaveActionsManager (#3277)
+- Remove the second parameter (the Project) from SdkFields constructor, it isn't used anymore. (#3261)
+- Add a comment to a recent change (#3267)
+- Fix a file handle leak (#3264)
+- Port inferPubRootDirectoryIfNeeded from devtools (#3242)
+- Add support for matching customized Widget tests. (#3249)
+- Hide DevTools debugger when launching from IntelliJ. (#3252)
+- Migrate to GearPlain (#3248)
+- Minor cleanup (#3247)
+- Inline sample index reading (#3245)
+- Make a newer daemon protocol field optional (#3230)
+- Link to the plugins readme file from the building instructions. (#3222)
+
+## 33.3
+- Fix an issue with an IllegalArgumentException when running Flutter apps
+
+## 33.2
+- Support IntelliJ 2018.3.3
+
+## 33.1
+- add menu and toolbar button to open Flutter DevTools
+- fix Gradle sync issue for Android Studio 3.3.1
+- fix highlighting of the Go link in sample banner
+
+## 33.0
+- update build for Android Studio 3.3.1
+- reorder console filters so links work
+- more intelligently enable support for detaching from Flutter apps on exit
+- change the icon used for paint baselines
+- prevent bazel test run configurations from generating in a non-bazel workspace
+- support 2019.1 eap
+- mention 'Dart' in the plugin description
+- correct the bazel output for debugging bazel tests
+- simplify the bazel parameters we pass to Bazel Run configurations
+- pin flutter error events in the log
+- propagate node selections to inspector
+- link support for log data entries
+- fix category cell rendering
+- add sample creation banner
+- add sample apps to Android Studio New Project Wizard
+- update log entry data badge
+
 ## 32.0
 - address an NPE in FlutterWidgetPerfManager.java
 - added overlay renderered for GC, snapshot and memory reset events

docs/building.md

@@ -27,4 +27,4 @@ $ gsutil cp <path-to-archive> gs://flutter_infra/flutter/intellij/
 ## The plugin tool
 
 Building is done by the `plugin` tool.
-See tool/plugin/README.md for details.
+See [tool/plugin/README.md](../tool/plugin/README.md) for details.

docs/testing.md

@@ -25,7 +25,8 @@ Validate basic project creation.
   * Project contents are created.
     * Verify that a run configuration (`main.dart`) is enabled in the run/debug selector.
   * Navigation works.
-    * Open `lib/main.dart` and navigate to `ThemeData`.
+    * Open `lib/main.dart` and navigate to `Scaffold`, from line 37 or so.
+    * Verify that the new editor includes a sample creation banner.
   * There are no analysis errors or warnings.
   * Pub operations work.
     * Open `pubspec.yaml` and click the "Packages get" and "Packages upgrade" links.

flutter-gui-tests/README.md

@@ -0,0 +1,36 @@
+# Flutter Plugin Integration Testing
+
+On the advice of Jetbrains engineers, we have switched the integration testing module to be
+a Gradle-built plugin. This allows the tests to run from anywhere; previously they only ran
+when copied into the GUI testing framework module. Thanks to karashevich@jetbrains for
+creating the plugin.
+
+## Usage
+
+1. Prepare the flutter-intellij plugin. Run `bin/plugin build` in a terminal. If you do not
+want to wait for all the distros to be build, consult product-matrix.json to find which version
+sets isTestTarget to true. Then you can use it as the value of the -o option to the build command.
+For example: `bin/plugin build -o3.5`
+
+2. Check that the buildPlugin task works normally. Open the Gradle
+tool view: View -> Tool Windows -> Gradle. Expamd `Tasks`, then expand `intellij`.
+Select `buildPliugin`, right-click and choose `Run ...`. This may take a while initially
+as it may have to download some files.
+
+3. For now, we use the built-in terminal to run tests. Open the terminal emulator in IntelliJ, then:
+```bash
+cd flutter-gui-tests
+./gradlew -Dtest.single=TestSuite clean test
+```
+
+## Editing
+
+Currently, the tests need to be edited in a minimal flutter-intellij project. Open the flutter-intellij
+project in IntelliJ 2019.1 for stand-alone editing, without Dart or IntelliJ sources (see CONTRIBUTING.md).
+
+If you want to test recent changes be sure to repeat Step 1 in Usage so you are testing the latest build.
+
+## Notes
+
+If the buildPlugin task fails, check for a new version of the Gradle plugin with id org.jetbrains.intellij.
+This is likely to be needed if a new version of IntelliJ is downloaded automatically.

flutter-gui-tests/build.gradle

@@ -0,0 +1,98 @@
+plugins {
+  id 'org.jetbrains.intellij' version '0.4.5'
+  id 'org.jetbrains.kotlin.jvm' version '1.3.21'
+}
+
+group 'io.flutter.tests.gui'
+version '1.0-SNAPSHOT'
+
+repositories {
+  mavenLocal()
+  mavenCentral()
+  jcenter()
+  // this repo contains the test target plugin produced by the plugin tool, io.flutter:SNAPSHOT
+  flatDir dirs: ['../releases/release_master/test_target']
+}
+
+dependencies {
+  compile "org.jetbrains.kotlin:kotlin-reflect"
+  testCompile group: 'junit', name: 'junit', version: '4.12'
+  testCompile fileTree(include: ['*.jar'], dir: '../releases/release_master/2019.1')
+  testImplementation fileTree(include: ['*.jar'], dir: '../releases/release_master/2019.1')
+}
+
+sourceSets {
+  main {
+    java.srcDir 'src'
+    kotlin.srcDir 'src'
+    resources.srcDir 'res'
+  }
+  test {
+    java.srcDir 'testSrc'
+    kotlin.srcDir 'testSrc'
+    resources.srcDir 'testData'
+  }
+}
+
+intellij {
+  plugins 'com.intellij.testGuiFramework:0.9.44.1@nightly', 'Dart:191.5849.16', 'io.flutter:SNAPSHOT'
+  if (System.getProperty("idea.gui.test.alternativeIdePath") != null) {
+    alternativeIdePath System.getProperty("idea.gui.test.alternativeIdePath")
+  }
+  updateSinceUntilBuild false
+//  version 'LATEST-TRUNK-SNAPSHOT'
+}
+kotlin {
+  experimental {
+    coroutines "enable"
+  }
+}
+
+compileKotlin {
+  kotlinOptions.jvmTarget = "1.8"
+}
+compileTestKotlin {
+  kotlinOptions.jvmTarget = "1.8"
+}
+
+task testsJar(type: Jar, dependsOn: classes) {
+  classifier = 'tests'
+  from sourceSets.test.output
+  exclude 'testData/*'
+}
+
+prepareSandbox {
+  from(testsJar) {
+    into "$pluginName/lib"
+  }
+}
+
+prepareTestingSandbox {
+  from(testsJar) {
+    into "$pluginName/lib"
+  }
+}
+
+runIde {
+  if (System.getProperty("idea.gui.tests.gradle.runner").equals("true")) {
+    systemProperties System.properties.findAll { (it.key as String).startsWith("idea") ||
+                                                 (it.key as String).startsWith("jb") }.findAll {
+                                                 (it.key as String) != "idea.home.path" &&
+                                                 (it.key as String) != "jb.vmOptionsFile"
+    }
+    /* Need to split the space-delimited value in the exec.args */
+    print systemProperties
+    args System.getProperty("exec.args", "").split(",")
+    print args
+  }
+}
+
+test {
+  def sysProps = System.properties.findAll { (it.key as String).startsWith("idea") ||
+                                             (it.key as String).startsWith("jb") &&
+                                             (it.key as String) != "idea.home.path" &&
+                                             (it.key as String) != "jb.vmOptionsFile"
+  }
+  sysProps.put("idea.gui.tests.gradle.runner", true) //Use Gradle Launcher to run GUI tests
+  systemProperties sysProps
+}

flutter-gui-tests/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Fri Jun 23 08:50:38 CEST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip