From 77304191b90fe13c286a0c94d71783c9198c9ad4 Mon Sep 17 00:00:00 2001 From: Jaime Wren Date: Tue, 29 Jul 2025 18:54:53 -0700 Subject: [PATCH 1/2] Remove DartFormatterInHtmlTest.java This was an old test for Dart embedded in html --- .../formatter/DartFormatterInHtmlTest.java | 34 ----------- .../test/testData/formatter/html/Default.html | 56 ------------------ .../formatter/html/Default_after.html | 57 ------------------- 3 files changed, 147 deletions(-) delete mode 100644 third_party/src/test/java/com/jetbrains/lang/dart/formatter/DartFormatterInHtmlTest.java delete mode 100644 third_party/src/test/testData/formatter/html/Default.html delete mode 100644 third_party/src/test/testData/formatter/html/Default_after.html diff --git a/third_party/src/test/java/com/jetbrains/lang/dart/formatter/DartFormatterInHtmlTest.java b/third_party/src/test/java/com/jetbrains/lang/dart/formatter/DartFormatterInHtmlTest.java deleted file mode 100644 index a0ecf56e1..000000000 --- a/third_party/src/test/java/com/jetbrains/lang/dart/formatter/DartFormatterInHtmlTest.java +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.jetbrains.lang.dart.formatter; - -import com.intellij.psi.formatter.FormatterTestCase; -import com.jetbrains.lang.dart.util.DartTestUtils; - -public class DartFormatterInHtmlTest extends FormatterTestCase { - - @Override - protected String getFileExtension() { - return "html"; - } - - @Override - protected String getTestDataPath() { - return DartTestUtils.BASE_TEST_DATA_PATH; - } - - @Override - protected String getBasePath() { - return "formatter/html"; - } - - @Override - protected void doTest(String resultNumber) throws Exception { - String testName = getTestName(false); - doTest(testName + "." + getFileExtension(), testName + "_after." + getFileExtension(), resultNumber); - } - - public void testDefault() throws Exception { - doTest(); - } -} - diff --git a/third_party/src/test/testData/formatter/html/Default.html b/third_party/src/test/testData/formatter/html/Default.html deleted file mode 100644 index 4555fb292..000000000 --- a/third_party/src/test/testData/formatter/html/Default.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - - diff --git a/third_party/src/test/testData/formatter/html/Default_after.html b/third_party/src/test/testData/formatter/html/Default_after.html deleted file mode 100644 index ed4658662..000000000 --- a/third_party/src/test/testData/formatter/html/Default_after.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - From 91a6368c52fd98889ac9ac82f510370195377259 Mon Sep 17 00:00:00 2001 From: Jaime Wren Date: Tue, 29 Jul 2025 19:08:04 -0700 Subject: [PATCH 2/2] Remove the Dart embedded in HTML extensions and tests # Conflicts: # third_party/CHANGELOG.md --- third_party/CHANGELOG.md | 1 + .../DartPackagePathReferenceContributor.java | 21 ----- .../psi/DartPackagePathReferenceProvider.java | 94 ------------------- .../src/main/resources/META-INF/plugin.xml | 3 - .../lang/dart/resolve/DartResolveTest.java | 39 -------- 5 files changed, 1 insertion(+), 157 deletions(-) delete mode 100644 third_party/src/main/java/com/jetbrains/lang/dart/psi/DartPackagePathReferenceContributor.java delete mode 100644 third_party/src/main/java/com/jetbrains/lang/dart/psi/DartPackagePathReferenceProvider.java diff --git a/third_party/CHANGELOG.md b/third_party/CHANGELOG.md index 435fc8d64..0a4d2cc8f 100644 --- a/third_party/CHANGELOG.md +++ b/third_party/CHANGELOG.md @@ -5,6 +5,7 @@ - Vendor change from "JetBrains" to "Google" - Build system change from Basel to Gradle - Removal of the old Code Coverage support, all references to com.intellij.coverage.* + - Removal of the Dart embedded in HTML support - Remove the "Scope analysis to the current package" feature from the Dart problem view - New Dart language feature: Dot Shorthands (https://youtrack.jetbrains.com/issue/IDEA-370100) - Support new 'Null-Aware Elements’ syntax (https://youtrack.jetbrains.com/issue/IDEA-374053) diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/psi/DartPackagePathReferenceContributor.java b/third_party/src/main/java/com/jetbrains/lang/dart/psi/DartPackagePathReferenceContributor.java deleted file mode 100644 index 360aed5ab..000000000 --- a/third_party/src/main/java/com/jetbrains/lang/dart/psi/DartPackagePathReferenceContributor.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jetbrains.lang.dart.psi; - -import com.intellij.psi.PsiReferenceContributor; -import com.intellij.psi.PsiReferenceRegistrar; -import com.intellij.psi.filters.ElementFilter; -import com.intellij.xml.util.XmlUtil; -import org.jetbrains.annotations.NotNull; - -/** - * @author Dennis.Ushakov - */ -public final class DartPackagePathReferenceContributor extends PsiReferenceContributor { - @Override - public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { - DartPackagePathReferenceProvider provider = new DartPackagePathReferenceProvider(); - String[] htmlAttrs = new String[]{"href", "src"}; - ElementFilter htmlFilter = DartPackagePathReferenceProvider.getFilter(); - XmlUtil - .registerXmlAttributeValueReferenceProvider(registrar, htmlAttrs, htmlFilter, false, provider, PsiReferenceRegistrar.HIGHER_PRIORITY); - } -} diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/psi/DartPackagePathReferenceProvider.java b/third_party/src/main/java/com/jetbrains/lang/dart/psi/DartPackagePathReferenceProvider.java deleted file mode 100644 index 3103ef4f3..000000000 --- a/third_party/src/main/java/com/jetbrains/lang/dart/psi/DartPackagePathReferenceProvider.java +++ /dev/null @@ -1,94 +0,0 @@ -// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.jetbrains.lang.dart.psi; - -import com.intellij.openapi.util.TextRange; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.*; -import com.intellij.psi.filters.ElementFilter; -import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReference; -import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceSet; -import com.intellij.psi.xml.XmlAttribute; -import com.intellij.psi.xml.XmlAttributeValue; -import com.intellij.psi.xml.XmlTag; -import com.intellij.util.ProcessingContext; -import com.intellij.xml.util.HtmlUtil; -import com.jetbrains.lang.dart.util.DartResolveUtil; -import com.jetbrains.lang.dart.util.DartUrlResolver; -import com.jetbrains.lang.dart.util.PubspecYamlUtil; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -/** - * Resolves path in {@code