flutter · AlexV525 · Aug 16, 2023 · Aug 17, 2023 · Aug 17, 2023 · Aug 17, 2023
diff --git a/.github/workflows/presubmit.yaml b/.github/workflows/presubmit.yaml
@@ -25,6 +25,8 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+        with:
+          submodules: true
       - name: build ${{ matrix.version }}
         run: ./tool/github.sh
         env:
@@ -38,6 +40,8 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+        with:
+          submodules: true
       - name: Linux ${{ matrix.bot }}
         run: ./tool/github.sh
         env:

diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
@@ -26,6 +26,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
         with:
           persist-credentials: false
+          submodules: true
 
       - name: "Run analysis"
         uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "resources/flutter"]
+	path = resources/flutter
+	url = https://github.com/flutter/tools_metadata
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -35,7 +35,7 @@ name and contact info to the [AUTHORS](AUTHORS) file.
 
 ## Getting started
 
-1. Install Flutter SDK from [Flutter SDK download](https://flutter.dev/docs/get-started/install) or
+1. Install Flutter SDK from [Flutter SDK download](https://docs.flutter.dev/get-started/install) or
    [GitHub](https://github.com/flutter/flutter) and set it up according to its instructions.
 2. Verify installation from the command line:
     - Connect an android device with USB debugging.
@@ -47,7 +47,7 @@ name and contact info to the [AUTHORS](AUTHORS) file.
    If you already have a fork, and are now installing a development environment on a new machine,
    make sure you've updated your fork with the master branch
    so that you don't use stale configuration options from long ago.
-4. `git clone -c core.symlinks=true https://github.com/<your_name_here>/flutter-intellij`
+4. `git clone -c core.symlinks=true https://github.com/<your_name_here>/flutter-intellij` --recursive
 5. `cd flutter-intellij`
 6. `git remote add upstream https://github.com/flutter/flutter-intellij`
    The name `upsteram` can be whatever you want.
@@ -148,7 +148,7 @@ Check out if the directory is a symlink by open the link in IDEA, and it'll disp
 Delete the file, then re-clone the repo using the below command:
 
 ```shell
-git clone -c core.symlinks=true https://github.com/<your_name_here>/flutter-intellij
+git clone -c core.symlinks=true https://github.com/<your_name_here>/flutter-intellij --recursive
 ```
 
 **NOTE**: Avoid symlinks addition during development as possible as you can,

diff --git a/README.md b/README.md
@@ -8,8 +8,8 @@ app SDK to help developers and designers build modern apps for iOS, Android and
 ## Documentation
 
 - [flutter.dev](https://flutter.dev)
-- [Installing Flutter](https://flutter.dev/docs/get-started/install)
-- [Getting Started with IntelliJ](https://flutter.dev/docs/development/tools/ide)
+- [Installing Flutter](https://docs.flutter.dev/get-started/install)
+- [Getting Started with IntelliJ](https://docs.flutter.dev/development/tools/ide)
 
 ## Fast development
 
@@ -21,9 +21,9 @@ simulators, and hardware for iOS and Android.
 
 ## Quick-start
 
-A brief summary of the [getting started guide](https://flutter.dev/docs/development/tools/ide):
+A brief summary of the [getting started guide](https://docs.flutter.dev/development/tools/ide):
 
-- install the [Flutter SDK](https://flutter.dev/docs/get-started/install)
+- install the [Flutter SDK](https://docs.flutter.dev/get-started/install)
 - run `flutter doctor` from the command line to verify your installation
 - ensure you have a supported IntelliJ development environment; either:
   - the latest stable version of [IntelliJ](https://www.jetbrains.com/idea/download), Community or Ultimate Edition (EAP versions are not always supported)

diff --git a/docs/testing.md b/docs/testing.md
@@ -4,8 +4,8 @@ Manual tests to execute before plugin releases.
 
 ## Setup
 
-Pre-reqs: Run through the [flutter setup](https://flutter.dev/docs/get-started/install) and
-[flutter getting started](https://flutter.dev/docs/development/tools/ide) guides.
+Pre-reqs: Run through the [flutter setup](https://docs.flutter.dev/get-started/install) and
+[flutter getting started](https://docs.flutter.dev/development/tools/ide) guides.
 
 * Run `flutter upgrade` in a terminal to get the latest version prior to starting testing.
 
@@ -172,7 +172,7 @@ Verify installation and configuration in a fresh IDEA installation.
 
 * Follow the instructions to
   [simulate a fresh installation](https://github.com/flutter/flutter-intellij/wiki/Development#simulating-a-fresh-install).
-* (If not running in a "runtime workbench", [install the plugins](https://flutter.dev/docs/development/packages-and-plugins/using-packages).)
+* (If not running in a "runtime workbench", [install the plugins](https://docs.flutter.dev/development/packages-and-plugins/using-packages).)
 * Open "Languages & Frameworks>Flutter" in Preferences and verify that there is
   no Flutter SDK set.
 * Set the Flutter SDK path to a valid SDK location.

diff --git a/flutter-idea/src/io/flutter/FlutterBundle.properties b/flutter-idea/src/io/flutter/FlutterBundle.properties
@@ -89,11 +89,11 @@ flutter.initializer.module.converted.title=Flutter module type updated
 
 flutter.reload.firstRun.title=Flutter supports hot reload!
 flutter.reload.firstRun.content=Apply changes to your app in place, instantly.
-flutter.reload.firstRun.url=https://flutter.dev/docs/development/tools/hot-reload
+flutter.reload.firstRun.url=https://docs.flutter.dev/development/tools/hot-reload
 
-flutter.io.gettingStarted.url=https://flutter.dev/docs/get-started/install
-flutter.io.gettingStarted.IDE.url=https://flutter.dev/docs/development/tools/ide
-flutter.io.runAndDebug.url=https://flutter.dev/docs/development/tools/ide/android-studio#running-and-debugging
+flutter.io.gettingStarted.url=https://docs.flutter.dev/get-started/install
+flutter.io.gettingStarted.IDE.url=https://docs.flutter.dev/development/tools/ide
+flutter.io.runAndDebug.url=https://docs.flutter.dev/development/tools/ide/android-studio#running-and-debugging
 
 devicelist.loading=Loading...
 

diff --git a/flutter-idea/src/io/flutter/editor/FlutterColors.java b/flutter-idea/src/io/flutter/editor/FlutterColors.java
@@ -49,7 +49,7 @@ public boolean isPrimary() {
     colors = new Properties();
 
     try {
-      colors.load(FlutterUtils.class.getResourceAsStream("/flutter/colors/material.properties"));
+      colors.load(FlutterUtils.class.getResourceAsStream("/flutter/resources/colors/material.properties"));
     }
     catch (IOException e) {
       FlutterUtils.warn(LOG, e);

diff --git a/flutter-idea/src/io/flutter/editor/FlutterCupertinoColors.java b/flutter-idea/src/io/flutter/editor/FlutterCupertinoColors.java
@@ -27,7 +27,7 @@ public class FlutterCupertinoColors {
     colors = new Properties();
 
     try {
-      colors.load(FlutterUtils.class.getResourceAsStream("/flutter/colors/cupertino.properties"));
+      colors.load(FlutterUtils.class.getResourceAsStream("/flutter/resources/colors/cupertino.properties"));
     }
     catch (IOException e) {
       FlutterUtils.warn(LOG, e);

diff --git a/flutter-idea/src/io/flutter/editor/FlutterCupertinoIcons.java b/flutter-idea/src/io/flutter/editor/FlutterCupertinoIcons.java
@@ -22,7 +22,7 @@ public class FlutterCupertinoIcons {
     icons = new Properties();
 
     try {
-      icons.load(FlutterCupertinoIcons.class.getResourceAsStream("/flutter/icons/cupertino.properties"));
+      icons.load(FlutterCupertinoIcons.class.getResourceAsStream("/flutter/resources/icons/cupertino.properties"));
     }
     catch (IOException e) {
       FlutterUtils.warn(LOG, e);
@@ -46,6 +46,6 @@ private static Icon getIcon(String name) {
     if (path == null) {
       return null;
     }
-    return IconLoader.findIcon("/flutter/icons/" + path, FlutterCupertinoIcons.class);
+    return IconLoader.findIcon("/flutter/resources/icons/" + path, FlutterCupertinoIcons.class);
   }
 }
diff --git a/flutter-idea/src/io/flutter/editor/FlutterMaterialIcons.java b/flutter-idea/src/io/flutter/editor/FlutterMaterialIcons.java
@@ -22,7 +22,7 @@ public class FlutterMaterialIcons {
     icons = new Properties();
 
     try {
-      icons.load(FlutterMaterialIcons.class.getResourceAsStream("/flutter/icons/material.properties"));
+      icons.load(FlutterMaterialIcons.class.getResourceAsStream("/flutter/resources/icons/material.properties"));
     }
     catch (IOException e) {
       FlutterUtils.warn(LOG, e);
@@ -46,6 +46,6 @@ private static Icon getIcon(String name) {
     if (path == null) {
       return null;
     }
-    return IconLoader.findIcon("/flutter/icons/" + path, FlutterMaterialIcons.class);
+    return IconLoader.findIcon("/flutter/resources/icons/" + path, FlutterMaterialIcons.class);
   }
 }
diff --git a/resources/flutter b/resources/flutter
diff --git a/resources/flutter/README.md b/resources/flutter/README.md