Skip to content

Commit 6a308c1

Browse files
committed
Remove the Dart embedded in HTML extensions and tests
1 parent ee7dbe8 commit 6a308c1

File tree

5 files changed

+1
-157
lines changed

5 files changed

+1
-157
lines changed

third_party/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
- Vendor change from "JetBrains" to "Google"
66
- Build system change from Basel to Gradle
77
- Removal of the old Code Coverage support, all references to com.intellij.coverage.*
8+
- Removal of the Dart embedded in HTML support
89
- New Dart language feature: Dot Shorthands (https://youtrack.jetbrains.com/issue/IDEA-370100)
910
- Support new 'Null-Aware Elements’ syntax (https://youtrack.jetbrains.com/issue/IDEA-374053)
1011
- Fix: IDE freezes after inserting a piece of Dart code (https://youtrack.jetbrains.com/issue/IDEA-231468)

third_party/src/main/java/com/jetbrains/lang/dart/psi/DartPackagePathReferenceContributor.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

third_party/src/main/java/com/jetbrains/lang/dart/psi/DartPackagePathReferenceProvider.java

Lines changed: 0 additions & 94 deletions
This file was deleted.

third_party/src/main/resources/META-INF/plugin.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@
7171
<postFormatProcessor implementation="com.jetbrains.lang.dart.ide.formatter.DartPostFormatProcessor"/>
7272
<readerModeMatcher implementation="com.jetbrains.lang.dart.ide.DartReaderModeMatcher"/>
7373
<lang.psiStructureViewFactory language="Dart" implementationClass="com.jetbrains.lang.dart.ide.structure.DartStructureViewFactory"/>
74-
<psi.referenceContributor language="HTML" implementation="com.jetbrains.lang.dart.psi.DartPackagePathReferenceContributor"
75-
order="last"/>
7674
<psi.referenceContributor language="Dart" implementation="com.jetbrains.lang.dart.psi.DartReferenceContributor"/>
7775
<psi.referenceContributor language="XML" implementation="com.jetbrains.lang.dart.psi.DartReferenceContributor"/>
7876
<xml.xmlTypedHandlersAdditionalSupport implementation="com.jetbrains.lang.dart.xml.DartXmlTypedHandlersAdditionalSupport" />
@@ -181,7 +179,6 @@
181179
implementationClass="com.jetbrains.lang.dart.ide.completion.DartServerStatementCompletionProcessor"/>
182180

183181
<annotator language="Dart" implementationClass="com.jetbrains.lang.dart.ide.annotator.DartAnnotator"/>
184-
<annotator language="HTML" implementationClass="com.jetbrains.lang.dart.ide.annotator.DartAnnotator"/>
185182
<annotator language="XML" implementationClass="com.jetbrains.lang.dart.ide.annotator.DartAnnotator"/>
186183

187184
<lang.findUsagesProvider language="Dart" implementationClass="com.jetbrains.lang.dart.ide.findUsages.DartFindUsagesProvider"/>

third_party/src/test/java/com/jetbrains/lang/dart/resolve/DartResolveTest.java

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -84,43 +84,4 @@ private void doTestResolveScope(final VirtualFile contextFile,
8484
assertFalse("Expected to be out of scope: " + file.getPath(), scope.contains(file));
8585
}
8686
}
87-
88-
public void testPackageReferencesInHtml() {
89-
myFixture.addFileToProject("pubspec.yaml", """
90-
name: ProjectName
91-
dependencies:
92-
PathPackage:
93-
path: local_package
94-
""");
95-
myFixture.addFileToProject("lib/projectFile.dart", "");
96-
myFixture.addFileToProject("local_package/lib/localPackageFile.html", "");
97-
myFixture.addFileToProject("packages/browser/dart.js", "");
98-
final PsiFile psiFile = myFixture.addFileToProject("web/file.html",
99-
"""
100-
<script src='<caret expected='packages'>packages/<caret expected='lib'>ProjectName/<caret expected='lib/projectFile.dart'>projectFile.dart'/>
101-
<script src='packages<caret expected='packages'>/PathPackage<caret expected='local_package/lib'>/localPackageFile.html<caret expected='local_package/lib/localPackageFile.html'>'/>
102-
<script src='<caret expected='packages'>packages/<caret expected='packages/browser'>browser/<caret expected='packages/browser/dart.js'>dart.js'/>
103-
""");
104-
myFixture.openFileInEditor(psiFile.getVirtualFile());
105-
doTest(myFixture);
106-
}
107-
108-
public void testPackageReferencesInHtmlViaDotPackages() {
109-
myFixture.addFileToProject("pubspec.yaml", "name: ProjectName");
110-
myFixture.addFileToProject("lib/projectFile.dart", "");
111-
myFixture.addFileToProject("local_package/lib/localPackageFile.html", "");
112-
myFixture.addFileToProject("global_package/browser/dart.js", "");
113-
myFixture.addFileToProject(".packages", """
114-
browser:global_package/browser/
115-
ProjectName:lib/
116-
PathPackage:local_package/lib/""");
117-
final PsiFile psiFile = myFixture.addFileToProject("web/file.html",
118-
"""
119-
<script src='<caret expected='.packages'>packages/<caret expected='lib'>ProjectName/<caret expected='lib/projectFile.dart'>projectFile.dart'/>
120-
<script src='packages<caret expected='.packages'>/PathPackage<caret expected='local_package/lib'>/localPackageFile.html<caret expected='local_package/lib/localPackageFile.html'>'/>
121-
<script src='<caret expected='.packages'>packages/<caret expected='global_package/browser'>browser/<caret expected='global_package/browser/dart.js'>dart.js'/>
122-
""");
123-
myFixture.openFileInEditor(psiFile.getVirtualFile());
124-
doTest(myFixture);
125-
}
12687
}

0 commit comments

Comments
 (0)