Fixes #1311 - move some classes from o.e.jface.text to org.eclipse.text (#1312)

robstryker · Rob Stryker · web-flow · commit 12511650deb0 · 2023-12-06T09:21:10.000+01:00
* Fixes #1311 - move some classes from o.e.jface.text to org.eclipse.text Signed-off-by: Rob Stryker <stryker@redhat.com> Co-authored-by: Rob Stryker <stryker@redhat.com>
diff --git a/bundles/org.eclipse.text/META-INF/MANIFEST.MF b/bundles/org.eclipse.text/META-INF/MANIFEST.MF
@@ -9,6 +9,7 @@ Export-Package:
  org.eclipse.jface.text; text="split"; mandatory:="text",
  org.eclipse.jface.text.link; text="split"; mandatory:="text",
  org.eclipse.jface.text.projection,
+ org.eclipse.jface.text.rules; text="split"; mandatory:="text",
  org.eclipse.jface.text.source; text="split"; mandatory:="text",
  org.eclipse.jface.text.templates; text="split"; mandatory:="text",
  org.eclipse.text.edits,
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/BufferedRuleBasedScanner.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/BufferedRuleBasedScanner.java
@@ -23,6 +23,8 @@
  * A buffered rule based scanner. The buffer always contains a section
  * of a fixed size of the document to be scanned. Completely adheres to
  * the contract of <code>RuleBasedScanner</code>.
+ * 
+ * @since 3.14
  */
 public class BufferedRuleBasedScanner extends RuleBasedScanner {
 
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/DefaultPartitioner.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/DefaultPartitioner.java
@@ -47,8 +47,10 @@
  * partitions in the document itself rather than maintaining its own data
  * structure.
  *
+ * Originally since 2.0 but moved to org.eclipse.text in 3.14
+ *
  * @see IPartitionTokenScanner
- * @since 2.0
+ * @since 3.14
  * @deprecated As of 3.1, replaced by {@link org.eclipse.jface.text.rules.FastPartitioner} instead
  */
 @Deprecated
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/EndOfLineRule.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/EndOfLineRule.java
@@ -19,6 +19,10 @@
  * A specific configuration of a single line rule
  * whereby the pattern begins with a specific sequence but
  * is only ended by a line delimiter.
+ * 
+ * Originally since unknown version, but moved to org.eclipse.text in 3.14
+ *
+ * @since 3.14
  */
 public class EndOfLineRule extends SingleLineRule {
 
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/FastPartitioner.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/FastPartitioner.java
@@ -55,8 +55,10 @@
  * The cached positions may be accessed through {@link #getPositions()}.
  * </p>
  *
+ * Originally since 3.1, but moved to org.eclipse.text in 3.14
+ *
  * @see IPartitionTokenScanner
- * @since 3.1
+ * @since 3.14
  */
 public class FastPartitioner implements IDocumentPartitioner, IDocumentPartitionerExtension, IDocumentPartitionerExtension2, IDocumentPartitionerExtension3 {
 
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/ICharacterScanner.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/ICharacterScanner.java
@@ -18,6 +18,9 @@
  * Defines the interface of a character scanner used by rules.
  * Rules may request the next character or ask the character
  * scanner to unread the last read character.
+ * Originally since unknown version, but moved to org.eclipse.text in 3.14
+ *
+ * @since 3.14
  */
 public interface ICharacterScanner {
 
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/IPartitionTokenScanner.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/IPartitionTokenScanner.java
@@ -25,7 +25,9 @@
  * boundary. A partition token scanner can also start in the middle of a partition,
  * if it knows the type of the partition.
  *
- * @since 2.0
+ * Originally since 2.0, but moved to org.eclipse.text in 3.14
+ *
+ * @since 3.14
  */
 public interface IPartitionTokenScanner  extends ITokenScanner {
 
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/IPredicateRule.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/IPredicateRule.java
@@ -20,8 +20,10 @@
  * token after having successfully detected content. This token is called success token.
  * Also, it also returns a token indicating that this rule has not been successful.
  *
+ * Originally since 2.0, but moved to org.eclipse.text in 3.14
+ *
+ * @since 3.14
  * @see ICharacterScanner
- * @since 2.0
  */
 public interface IPredicateRule extends IRule {
 
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/IRule.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/IRule.java
@@ -18,6 +18,9 @@
  * Defines the interface for a rule used in the scanning of text for the purpose of document
  * partitioning or text styling.
  *
+ * Originally since unknown version, but moved to org.eclipse.text in 3.14
+ *
+ * @since 3.14
  * @see ICharacterScanner
  */
 public interface IRule {
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/IToken.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/IToken.java
@@ -16,6 +16,9 @@
 
 /**
  * A token to be returned by a rule.
+ * Originally since unknown version, but moved to org.eclipse.text in 3.14
+ *
+ * @since 3.14
  */
 public interface IToken {
 
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/ITokenScanner.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/ITokenScanner.java
@@ -23,8 +23,10 @@
  * A scanner has state. When asked, the scanner returns the offset and the length of the
  * last found token.
  *
+ * Originally since 2.0, but moved to org.eclipse.text in 3.14
+ *
  * @see org.eclipse.jface.text.rules.IToken
- * @since 2.0
+ * @since 3.14
  */
 public interface ITokenScanner {
 
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/IWhitespaceDetector.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/IWhitespaceDetector.java
@@ -18,6 +18,9 @@
  * Defines the interface by which <code>WhitespaceRule</code>
  * determines whether a given character is to be considered
  * whitespace in the current context.
+ * Originally since unknown version, but moved to org.eclipse.text in 3.14
+ *
+ * @since 3.14
  */
 public interface IWhitespaceDetector {
 
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/IWordDetector.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/IWordDetector.java
@@ -18,6 +18,9 @@
  * Defines the interface by which <code>WordRule</code>
  * determines whether a given character is valid as part
  * of a word in the current context.
+ * Originally since unknown version, but moved to org.eclipse.text in 3.14
+ *
+ * @since 3.14
  */
 public interface IWordDetector {
 
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/MultiLineRule.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/MultiLineRule.java
@@ -18,6 +18,9 @@
  * A rule for detecting patterns which begin with a given
  * sequence and may end with a given sequence thereby spanning
  * multiple lines.
+ * Originally since unknown version, but moved to org.eclipse.text in 3.14
+ *
+ * @since 3.14
  */
 public class MultiLineRule extends PatternRule {
 
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/NumberRule.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/NumberRule.java
@@ -19,6 +19,9 @@
 
 /**
  * An implementation of <code>IRule</code> detecting a numerical value.
+ * Originally since unknown version, but moved to org.eclipse.text in 3.14
+ *
+ * @since 3.14
  */
 public class NumberRule implements IRule {
 
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/PatternRule.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/PatternRule.java
@@ -28,6 +28,9 @@
  * the pattern can be constrained to begin in a certain column. The rule can also
  * be used to check whether the text to scan covers half of the pattern, i.e. contains
  * the end sequence required by the rule.
+ * Originally since unknown version, but moved to org.eclipse.text in 3.14
+ *
+ * @since 3.14
  */
 public class PatternRule implements IPredicateRule {
 
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/RuleBasedPartitionScanner.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/RuleBasedPartitionScanner.java
@@ -26,7 +26,9 @@
  * the given content type.
  * </p>
  *
- * @since 2.0
+ * Originally since 2.0, but moved to org.eclipse.text in 3.14
+ *
+ * @since 3.14
  */
 public class RuleBasedPartitionScanner extends BufferedRuleBasedScanner implements IPartitionTokenScanner {
 
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/RuleBasedPartitioner.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/RuleBasedPartitioner.java
@@ -46,6 +46,9 @@
  * as their data. The partitioner remembers the document's partitions
  * in the document itself rather than maintaining its own data structure.
  *
+ * Originally since unknown version, but moved to org.eclipse.text in 3.14
+ *
+ * @since 3.14
  * @see IRule
  * @see RuleBasedScanner
  *
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/RuleBasedScanner.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/RuleBasedScanner.java
@@ -31,6 +31,9 @@
  * of the file is reached. In this case the token returns <code>true</code> when calling
  * <code>isEOF</code>.
  *
+ * Originally since unknown version, but moved to org.eclipse.text in 3.14
+ *
+ * @since 3.14
  * @see IRule
  */
 public class RuleBasedScanner implements ICharacterScanner, ITokenScanner {
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/SingleLineRule.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/SingleLineRule.java
@@ -20,6 +20,9 @@
  * the pattern begins with a specific sequence and may
  * end with a specific sequence, but will not span more
  * than a single line.
+ * Originally since unknown version, but moved to org.eclipse.text in 3.14
+ *
+ * @since 3.14
  */
 public class SingleLineRule extends PatternRule {
 
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/Token.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/Token.java
@@ -19,6 +19,9 @@
 
 /**
  * Standard implementation of <code>IToken</code>.
+ * Originally since unknown version, but moved to org.eclipse.text in 3.14
+ *
+ * @since 3.14
  */
 public class Token implements IToken {
 
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/WhitespaceRule.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/WhitespaceRule.java
@@ -23,6 +23,9 @@
  * A whitespace rule uses a whitespace detector in order to find out which
  * characters are whitespace characters.
  *
+ * Originally since unknown version, but moved to org.eclipse.text in 3.14
+ *
+ * @since 3.14
  * @see IWhitespaceDetector
  */
 public class WhitespaceRule implements IRule {
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/WordPatternRule.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/WordPatternRule.java
@@ -22,6 +22,9 @@
  * A specific single line rule which stipulates that the start
  * and end sequence occur within a single word, as defined by a word detector.
  *
+ * Originally since unknown version, but moved to org.eclipse.text in 3.14
+ *
+ * @since 3.14
  * @see IWordDetector
  */
 public class WordPatternRule extends SingleLineRule {
diff --git a/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/WordRule.java b/bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/WordRule.java
@@ -26,6 +26,9 @@
  * matches, but also for the generalized notion of a word in the context in which it is used. A word
  * rule uses a word detector to determine what a word is.
  *
+ * Originally since unknown version, but moved to org.eclipse.text in 3.14
+ *
+ * @since 3.14
  * @see IWordDetector
  */
 public class WordRule implements IRule {
