Merge branch 'master' into ITextViewerLifecycle

eclipse-platform · Nov 10, 2022 · 6ab3561 · 6ab3561
2 parents c4649ab + d04589f
commit 6ab3561
Show file tree

Hide file tree

Showing 28 changed files with 59 additions and 358 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,7 @@ heapdump.*
 core.*
 Snap.*
 # maven
->>>>>>> 2411f5e... Bug 548210 - Only send textDocument/didSave if the supports it
 target/
-/*/target/
 .DS_Store
+.polyglot.*
+pom.tycho
diff --git a/org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF b/org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.core.filebuffers.tests;singleton:=true
-Bundle-Version: 3.12.200.qualifier
+Bundle-Version: 3.12.300.qualifier
 Bundle-Activator: org.eclipse.core.filebuffers.tests.FileBuffersTestPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Plugin.providerName

diff --git a/org.eclipse.core.filebuffers.tests/build.properties b/org.eclipse.core.filebuffers.tests/build.properties
@@ -23,3 +23,7 @@ bin.includes = plugin.properties,\
 src.includes = about.html
 
 source.. = src/
+
+# Maven/Tycho pom model adjustments
+pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
+pom.model.property.testClass = org.eclipse.core.filebuffers.tests.FileBuffersTestSuite
diff --git a/org.eclipse.core.filebuffers.tests/pom.xml b/org.eclipse.core.filebuffers.tests/pom.xml
diff --git a/org.eclipse.jface.text.examples/build.properties b/org.eclipse.jface.text.examples/build.properties
@@ -2,3 +2,7 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .
+
+# Maven/Tycho pom model adjustments
+# bundle not in baseline
+pom.model.property.skipAPIAnalysis = true
diff --git a/org.eclipse.jface.text.examples/pom.xml b/org.eclipse.jface.text.examples/pom.xml
diff --git a/org.eclipse.jface.text.tests/build.properties b/org.eclipse.jface.text.tests/build.properties
@@ -21,3 +21,9 @@ bin.includes = plugin.properties,\
 src.includes = about.html
 
 source.. = src/
+
+# Maven/Tycho pom model adjustments
+pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
+pom.model.property.testClass = org.eclipse.jface.text.tests.JFaceTextTestSuite
+pom.model.property.tycho.surefire.useUIHarness = true
+pom.model.property.tycho.surefire.useUIThread = true
diff --git a/org.eclipse.jface.text.tests/pom.xml b/org.eclipse.jface.text.tests/pom.xml
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/codemining/CodeMiningReconciler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/codemining/CodeMiningReconciler.java
@@ -44,10 +44,11 @@ public void install(ITextViewer textViewer) {
 	@Override
 	public void uninstall() {
 		ITextViewer viewer= getTextViewer();
-		if (viewer != null && viewer.getTextWidget().getData(KEY) == this) {
+		if (viewer != null && viewer.getTextWidget() != null && viewer.getTextWidget().getData(KEY) == this) {
 			super.uninstall();
 			viewer.getTextWidget().setData(KEY, null);
 		}
+		viewer= null;
 	}
 
 

diff --git a/org.eclipse.search.tests/META-INF/MANIFEST.MF b/org.eclipse.search.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.search.tests
-Bundle-Version: 3.10.100.qualifier
+Bundle-Version: 3.10.200.qualifier
 Bundle-Activator: org.eclipse.search.tests.SearchTestPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

diff --git a/org.eclipse.search.tests/build.properties b/org.eclipse.search.tests/build.properties
@@ -20,3 +20,9 @@ bin.includes = plugin.properties,\
                META-INF/,\
                about.html,\
                test.xml
+
+# Maven/Tycho pom model adjustments
+pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
+pom.model.property.testClass = org.eclipse.search.tests.AllSearchTests
+pom.model.property.tycho.surefire.useUIHarness = true
+pom.model.property.tycho.surefire.useUIThread = true
diff --git a/org.eclipse.search.tests/pom.xml b/org.eclipse.search.tests/pom.xml
diff --git a/org.eclipse.text.quicksearch.tests/META-INF/MANIFEST.MF b/org.eclipse.text.quicksearch.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.text.quicksearch.tests
-Bundle-Version: 1.1.200.qualifier
+Bundle-Version: 1.1.300.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.text.quicksearch;bundle-version="1.0.300",
  org.eclipse.core.resources,

diff --git a/org.eclipse.text.quicksearch.tests/build.properties b/org.eclipse.text.quicksearch.tests/build.properties
@@ -17,3 +17,9 @@ bin.includes = META-INF/,\
                about.html,\
                .,\
                plugin.properties
+
+# Maven/Tycho pom model adjustments
+pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
+pom.model.property.testClass = org.eclipse.text.quicksearch.tests.*Test
+pom.model.property.tycho.surefire.useUIHarness = true
+pom.model.property.tycho.surefire.useUIThread = true
diff --git a/org.eclipse.text.quicksearch.tests/pom.xml b/org.eclipse.text.quicksearch.tests/pom.xml
diff --git a/org.eclipse.text.tests/META-INF/MANIFEST.MF b/org.eclipse.text.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.text.tests
-Bundle-Version: 3.13.100.qualifier
+Bundle-Version: 3.13.200.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Export-Package: 

diff --git a/org.eclipse.text.tests/build.properties b/org.eclipse.text.tests/build.properties
@@ -21,3 +21,7 @@ src.includes = about.html
 
 source.. = projection/,\
            src/
+
+# Maven/Tycho pom model adjustments
+pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
+pom.model.property.testClass = org.eclipse.text.tests.EclipseTextTestSuite
diff --git a/org.eclipse.text.tests/pom.xml b/org.eclipse.text.tests/pom.xml
diff --git a/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF b/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.ui.editors.tests;singleton:=true
-Bundle-Version: 3.12.500.qualifier
+Bundle-Version: 3.12.600.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.ui.editors.tests

diff --git a/org.eclipse.ui.editors.tests/build.properties b/org.eclipse.ui.editors.tests/build.properties
@@ -22,3 +22,9 @@ bin.includes = plugin.properties,\
 src.includes = about.html
 
 source.. = src/
+
+# Maven/Tycho pom model adjustments
+pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
+pom.model.property.testClass = org.eclipse.ui.editors.tests.EditorsTestSuite
+pom.model.property.tycho.surefire.useUIHarness = true
+pom.model.property.tycho.surefire.useUIThread = true
diff --git a/org.eclipse.ui.editors.tests/pom.xml b/org.eclipse.ui.editors.tests/pom.xml
diff --git a/org.eclipse.ui.genericeditor.tests/META-INF/MANIFEST.MF b/org.eclipse.ui.genericeditor.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.ui.genericeditor.tests;singleton:=true
-Bundle-Version: 1.2.100.qualifier
+Bundle-Version: 1.2.200.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.ui.genericeditor.tests,