From 82bbf5b98b889e64b578b54be218ca1f7e68c611 Mon Sep 17 00:00:00 2001 From: JohnHake Date: Tue, 7 Apr 2020 16:43:27 -0700 Subject: [PATCH] [code samples] Update to 2020.1 IntelliJ Platform IJSDK-802 --- action_basics/build.gradle | 2 +- comparing_references_inspection/build.gradle | 2 +- conditional_operator_intention/build.gradle | 2 +- editor_basics/build.gradle | 2 +- facet_basics/build.gradle | 2 +- framework_basics/build.gradle | 2 +- inspection_basics/build.gradle | 2 +- kotlin_demo/build.gradle | 2 +- live_templates/build.gradle | 2 +- max_opened_projects/build.gradle | 2 +- module/build.gradle | 2 +- product_specific/pycharm_basics/build.gradle | 2 +- project_model/build.gradle | 2 +- project_view_pane/build.gradle | 2 +- .../org/intellij/sdk/view/pane/ImagesProjectNode.java | 4 ++-- project_wizard/build.gradle | 2 +- psi_demo/build.gradle | 2 +- run_configuration/build.gradle | 2 +- simple_language_plugin/build.gradle | 2 +- tool_window/build.gradle | 2 +- tree_structure_provider/build.gradle | 2 +- .../TextOnlyTreeStructureProvider.java | 10 +++++----- 22 files changed, 27 insertions(+), 27 deletions(-) diff --git a/action_basics/build.gradle b/action_basics/build.gradle index bbaeaba38..334230dba 100644 --- a/action_basics/build.gradle +++ b/action_basics/build.gradle @@ -16,7 +16,7 @@ repositories { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '201-EAP-SNAPSHOT' + version '2020.1' sameSinceUntilBuild = true } patchPluginXml { diff --git a/comparing_references_inspection/build.gradle b/comparing_references_inspection/build.gradle index 7eed22c72..27ba42742 100644 --- a/comparing_references_inspection/build.gradle +++ b/comparing_references_inspection/build.gradle @@ -26,7 +26,7 @@ dependencies { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '2019.3.4' + version '2020.1' plugins 'java' sameSinceUntilBuild = true } diff --git a/conditional_operator_intention/build.gradle b/conditional_operator_intention/build.gradle index 7bc5a6b74..313f5535a 100644 --- a/conditional_operator_intention/build.gradle +++ b/conditional_operator_intention/build.gradle @@ -26,7 +26,7 @@ test { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '2019.3.4' + version '2020.1' plugins 'java' sameSinceUntilBuild = true } diff --git a/editor_basics/build.gradle b/editor_basics/build.gradle index 4a61fa9cb..334230dba 100644 --- a/editor_basics/build.gradle +++ b/editor_basics/build.gradle @@ -16,7 +16,7 @@ repositories { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '2019.3.4' + version '2020.1' sameSinceUntilBuild = true } patchPluginXml { diff --git a/facet_basics/build.gradle b/facet_basics/build.gradle index d01862b8e..599c038e8 100644 --- a/facet_basics/build.gradle +++ b/facet_basics/build.gradle @@ -16,7 +16,7 @@ repositories { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '2019.3.4' + version '2020.1' sameSinceUntilBuild = true } patchPluginXml { diff --git a/framework_basics/build.gradle b/framework_basics/build.gradle index 1bc853ee8..af2213883 100644 --- a/framework_basics/build.gradle +++ b/framework_basics/build.gradle @@ -16,7 +16,7 @@ repositories { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '2019.3.4' + version '2020.1' plugins 'java' sameSinceUntilBuild = true } diff --git a/inspection_basics/build.gradle b/inspection_basics/build.gradle index 93d31199a..9ab6b06a6 100644 --- a/inspection_basics/build.gradle +++ b/inspection_basics/build.gradle @@ -16,7 +16,7 @@ repositories { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '2019.3.4' + version '2020.1' sameSinceUntilBuild = true } diff --git a/kotlin_demo/build.gradle b/kotlin_demo/build.gradle index 38f6fe6d4..bf5935a1c 100644 --- a/kotlin_demo/build.gradle +++ b/kotlin_demo/build.gradle @@ -25,7 +25,7 @@ sourceSets { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '2019.3.4' + version '2020.1' sameSinceUntilBuild = true } compileKotlin { diff --git a/live_templates/build.gradle b/live_templates/build.gradle index 2e008771f..1cafc660a 100644 --- a/live_templates/build.gradle +++ b/live_templates/build.gradle @@ -16,7 +16,7 @@ repositories { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '201-EAP-SNAPSHOT' + version '2020.1' sameSinceUntilBuild = true } patchPluginXml { diff --git a/max_opened_projects/build.gradle b/max_opened_projects/build.gradle index c1952d66b..d7de4e40f 100644 --- a/max_opened_projects/build.gradle +++ b/max_opened_projects/build.gradle @@ -16,7 +16,7 @@ repositories { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '2019.3.4' + version '2020.1' sameSinceUntilBuild = true } patchPluginXml { diff --git a/module/build.gradle b/module/build.gradle index 93d31199a..9ab6b06a6 100644 --- a/module/build.gradle +++ b/module/build.gradle @@ -16,7 +16,7 @@ repositories { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '2019.3.4' + version '2020.1' sameSinceUntilBuild = true } diff --git a/product_specific/pycharm_basics/build.gradle b/product_specific/pycharm_basics/build.gradle index 10271feb8..16145dbe8 100644 --- a/product_specific/pycharm_basics/build.gradle +++ b/product_specific/pycharm_basics/build.gradle @@ -16,7 +16,7 @@ repositories { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '2019.3.4' + version '2020.1' type 'PY' sameSinceUntilBuild = true } diff --git a/project_model/build.gradle b/project_model/build.gradle index 1bc853ee8..af2213883 100644 --- a/project_model/build.gradle +++ b/project_model/build.gradle @@ -16,7 +16,7 @@ repositories { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '2019.3.4' + version '2020.1' plugins 'java' sameSinceUntilBuild = true } diff --git a/project_view_pane/build.gradle b/project_view_pane/build.gradle index ac1e4fb3f..e46fa9010 100644 --- a/project_view_pane/build.gradle +++ b/project_view_pane/build.gradle @@ -16,7 +16,7 @@ repositories { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '2019.3.4' + version '2020.1' sameSinceUntilBuild = true } diff --git a/project_view_pane/src/main/java/org/intellij/sdk/view/pane/ImagesProjectNode.java b/project_view_pane/src/main/java/org/intellij/sdk/view/pane/ImagesProjectNode.java index 46e45995e..e363d4104 100644 --- a/project_view_pane/src/main/java/org/intellij/sdk/view/pane/ImagesProjectNode.java +++ b/project_view_pane/src/main/java/org/intellij/sdk/view/pane/ImagesProjectNode.java @@ -72,7 +72,7 @@ public class ImagesProjectNode extends AbstractTreeNode { @NotNull @Override - public Collection getChildren() { + public Collection> getChildren() { final List files = new ArrayList<>(0); for (VirtualFile file : getValue().getChildren()) { if (getImagesFiles(myProject).contains(file)) { @@ -80,7 +80,7 @@ public class ImagesProjectNode extends AbstractTreeNode { } } if (files.isEmpty()) return Collections.emptyList(); - final List nodes = new ArrayList<>(files.size()); + final List> nodes = new ArrayList<>(files.size()); final boolean alwaysOnTop = ProjectView.getInstance(myProject).isFoldersAlwaysOnTop(""); Collections.sort(files, (o1, o2) -> { if (alwaysOnTop) { diff --git a/project_wizard/build.gradle b/project_wizard/build.gradle index ac1e4fb3f..e46fa9010 100644 --- a/project_wizard/build.gradle +++ b/project_wizard/build.gradle @@ -16,7 +16,7 @@ repositories { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '2019.3.4' + version '2020.1' sameSinceUntilBuild = true } diff --git a/psi_demo/build.gradle b/psi_demo/build.gradle index 1bc853ee8..af2213883 100644 --- a/psi_demo/build.gradle +++ b/psi_demo/build.gradle @@ -16,7 +16,7 @@ repositories { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '2019.3.4' + version '2020.1' plugins 'java' sameSinceUntilBuild = true } diff --git a/run_configuration/build.gradle b/run_configuration/build.gradle index 93d31199a..9ab6b06a6 100644 --- a/run_configuration/build.gradle +++ b/run_configuration/build.gradle @@ -16,7 +16,7 @@ repositories { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '2019.3.4' + version '2020.1' sameSinceUntilBuild = true } diff --git a/simple_language_plugin/build.gradle b/simple_language_plugin/build.gradle index 94de20fe2..2ea38efac 100644 --- a/simple_language_plugin/build.gradle +++ b/simple_language_plugin/build.gradle @@ -30,7 +30,7 @@ dependencies { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '2019.3.4' + version '2020.1' plugins 'java' sameSinceUntilBuild = true } diff --git a/tool_window/build.gradle b/tool_window/build.gradle index 93d31199a..9ab6b06a6 100644 --- a/tool_window/build.gradle +++ b/tool_window/build.gradle @@ -16,7 +16,7 @@ repositories { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '2019.3.4' + version '2020.1' sameSinceUntilBuild = true } diff --git a/tree_structure_provider/build.gradle b/tree_structure_provider/build.gradle index 93d31199a..9ab6b06a6 100644 --- a/tree_structure_provider/build.gradle +++ b/tree_structure_provider/build.gradle @@ -16,7 +16,7 @@ repositories { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version '2019.3.4' + version '2020.1' sameSinceUntilBuild = true } diff --git a/tree_structure_provider/src/main/java/org/intellij/sdk/treeStructureProvider/TextOnlyTreeStructureProvider.java b/tree_structure_provider/src/main/java/org/intellij/sdk/treeStructureProvider/TextOnlyTreeStructureProvider.java index f74dcca28..8e5e0f24c 100644 --- a/tree_structure_provider/src/main/java/org/intellij/sdk/treeStructureProvider/TextOnlyTreeStructureProvider.java +++ b/tree_structure_provider/src/main/java/org/intellij/sdk/treeStructureProvider/TextOnlyTreeStructureProvider.java @@ -14,11 +14,11 @@ import java.util.*; public class TextOnlyTreeStructureProvider implements TreeStructureProvider { @NotNull @Override - public Collection modify(@NotNull AbstractTreeNode parent, - @NotNull Collection children, + public Collection> modify(@NotNull AbstractTreeNode parent, + @NotNull Collection> children, ViewSettings settings) { - ArrayList nodes = new ArrayList<>(); - for (AbstractTreeNode child : children) { + ArrayList> nodes = new ArrayList<>(); + for (AbstractTreeNode child : children) { if (child instanceof PsiFileNode) { VirtualFile file = ((PsiFileNode) child).getVirtualFile(); if (file != null && !file.isDirectory() && !(file.getFileType() instanceof PlainTextFileType)) { @@ -32,7 +32,7 @@ public class TextOnlyTreeStructureProvider implements TreeStructureProvider { @Nullable @Override - public Object getData(@NotNull Collection selected, @NotNull String dataId) { + public Object getData(@NotNull Collection> selected, @NotNull String dataId) { return null; } }