feat: register language pack content types with compare viewers #730

eclipse · Mar 11, 2024 · 332a3cc · 332a3cc
1 parent c66b225
commit 332a3cc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/org.eclipse.tm4e.language_pack/META-INF/MANIFEST.MF b/org.eclipse.tm4e.language_pack/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@ Require-Bundle: org.eclipse.tm4e.ui;bundle-version="0.10.4",
  org.eclipse.tm4e.languageconfiguration;bundle-version="0.10.4",
  org.eclipse.ui.editors;bundle-version="[3.3.0,4.0.0)",
  org.eclipse.ui.genericeditor;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.core.contenttype;bundle-version="[3.2.0,4.0.0)"
+ org.eclipse.core.contenttype;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.compare;resolution:=optional
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.tm4e.language_pack
diff --git a/org.eclipse.tm4e.language_pack/plugin.xml b/org.eclipse.tm4e.language_pack/plugin.xml
@@ -19,6 +19,16 @@
       contentTypeId="org.eclipse.tm4e.language_pack.basetype"
       editorId="org.eclipse.ui.genericeditor.GenericEditor" />
   </extension>
+  <extension point="org.eclipse.compare.contentViewers">
+    <contentTypeBinding
+      contentTypeId="org.eclipse.tm4e.language_pack.basetype"
+      contentViewerId="org.eclipse.ui.genericeditor.compareViewer" />
+  </extension>
+  <extension point="org.eclipse.compare.contentMergeViewers">
+    <contentTypeBinding
+      contentTypeId="org.eclipse.tm4e.language_pack.basetype"
+      contentMergeViewerId="org.eclipse.ui.genericeditor.compareViewer" />
+  </extension>
 
   <!-- ======================================== -->
   <!-- TextMate                                 -->