Skip to content

Commit 1251165

Browse files
robstrykerRob Stryker
and
Rob Stryker
authored
Fixes #1311 - move some classes from o.e.jface.text to org.eclipse.text (#1312)
* Fixes #1311 - move some classes from o.e.jface.text to org.eclipse.text Signed-off-by: Rob Stryker <[email protected]> Co-authored-by: Rob Stryker <[email protected]>
1 parent 3665f4d commit 1251165

24 files changed

+70
-6
lines changed

bundles/org.eclipse.text/META-INF/MANIFEST.MF

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Export-Package:
99
org.eclipse.jface.text; text="split"; mandatory:="text",
1010
org.eclipse.jface.text.link; text="split"; mandatory:="text",
1111
org.eclipse.jface.text.projection,
12+
org.eclipse.jface.text.rules; text="split"; mandatory:="text",
1213
org.eclipse.jface.text.source; text="split"; mandatory:="text",
1314
org.eclipse.jface.text.templates; text="split"; mandatory:="text",
1415
org.eclipse.text.edits,

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/BufferedRuleBasedScanner.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/BufferedRuleBasedScanner.java

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
* A buffered rule based scanner. The buffer always contains a section
2424
* of a fixed size of the document to be scanned. Completely adheres to
2525
* the contract of <code>RuleBasedScanner</code>.
26+
*
27+
* @since 3.14
2628
*/
2729
public class BufferedRuleBasedScanner extends RuleBasedScanner {
2830

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/DefaultPartitioner.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/DefaultPartitioner.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@
4747
* partitions in the document itself rather than maintaining its own data
4848
* structure.
4949
*
50+
* Originally since 2.0 but moved to org.eclipse.text in 3.14
51+
*
5052
* @see IPartitionTokenScanner
51-
* @since 2.0
53+
* @since 3.14
5254
* @deprecated As of 3.1, replaced by {@link org.eclipse.jface.text.rules.FastPartitioner} instead
5355
*/
5456
@Deprecated

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/EndOfLineRule.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/EndOfLineRule.java

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
* A specific configuration of a single line rule
2020
* whereby the pattern begins with a specific sequence but
2121
* is only ended by a line delimiter.
22+
*
23+
* Originally since unknown version, but moved to org.eclipse.text in 3.14
24+
*
25+
* @since 3.14
2226
*/
2327
public class EndOfLineRule extends SingleLineRule {
2428

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/FastPartitioner.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/FastPartitioner.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@
5555
* The cached positions may be accessed through {@link #getPositions()}.
5656
* </p>
5757
*
58+
* Originally since 3.1, but moved to org.eclipse.text in 3.14
59+
*
5860
* @see IPartitionTokenScanner
59-
* @since 3.1
61+
* @since 3.14
6062
*/
6163
public class FastPartitioner implements IDocumentPartitioner, IDocumentPartitionerExtension, IDocumentPartitionerExtension2, IDocumentPartitionerExtension3 {
6264

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/ICharacterScanner.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/ICharacterScanner.java

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
* Defines the interface of a character scanner used by rules.
1919
* Rules may request the next character or ask the character
2020
* scanner to unread the last read character.
21+
* Originally since unknown version, but moved to org.eclipse.text in 3.14
22+
*
23+
* @since 3.14
2124
*/
2225
public interface ICharacterScanner {
2326

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/IPartitionTokenScanner.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/IPartitionTokenScanner.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
* boundary. A partition token scanner can also start in the middle of a partition,
2626
* if it knows the type of the partition.
2727
*
28-
* @since 2.0
28+
* Originally since 2.0, but moved to org.eclipse.text in 3.14
29+
*
30+
* @since 3.14
2931
*/
3032
public interface IPartitionTokenScanner extends ITokenScanner {
3133

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/IPredicateRule.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/IPredicateRule.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@
2020
* token after having successfully detected content. This token is called success token.
2121
* Also, it also returns a token indicating that this rule has not been successful.
2222
*
23+
* Originally since 2.0, but moved to org.eclipse.text in 3.14
24+
*
25+
* @since 3.14
2326
* @see ICharacterScanner
24-
* @since 2.0
2527
*/
2628
public interface IPredicateRule extends IRule {
2729

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/IRule.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/IRule.java

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
* Defines the interface for a rule used in the scanning of text for the purpose of document
1919
* partitioning or text styling.
2020
*
21+
* Originally since unknown version, but moved to org.eclipse.text in 3.14
22+
*
23+
* @since 3.14
2124
* @see ICharacterScanner
2225
*/
2326
public interface IRule {

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/IToken.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/IToken.java

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
/**
1818
* A token to be returned by a rule.
19+
* Originally since unknown version, but moved to org.eclipse.text in 3.14
20+
*
21+
* @since 3.14
1922
*/
2023
public interface IToken {
2124

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/ITokenScanner.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/ITokenScanner.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@
2323
* A scanner has state. When asked, the scanner returns the offset and the length of the
2424
* last found token.
2525
*
26+
* Originally since 2.0, but moved to org.eclipse.text in 3.14
27+
*
2628
* @see org.eclipse.jface.text.rules.IToken
27-
* @since 2.0
29+
* @since 3.14
2830
*/
2931
public interface ITokenScanner {
3032

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/IWhitespaceDetector.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/IWhitespaceDetector.java

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
* Defines the interface by which <code>WhitespaceRule</code>
1919
* determines whether a given character is to be considered
2020
* whitespace in the current context.
21+
* Originally since unknown version, but moved to org.eclipse.text in 3.14
22+
*
23+
* @since 3.14
2124
*/
2225
public interface IWhitespaceDetector {
2326

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/IWordDetector.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/IWordDetector.java

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
* Defines the interface by which <code>WordRule</code>
1919
* determines whether a given character is valid as part
2020
* of a word in the current context.
21+
* Originally since unknown version, but moved to org.eclipse.text in 3.14
22+
*
23+
* @since 3.14
2124
*/
2225
public interface IWordDetector {
2326

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/MultiLineRule.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/MultiLineRule.java

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
* A rule for detecting patterns which begin with a given
1919
* sequence and may end with a given sequence thereby spanning
2020
* multiple lines.
21+
* Originally since unknown version, but moved to org.eclipse.text in 3.14
22+
*
23+
* @since 3.14
2124
*/
2225
public class MultiLineRule extends PatternRule {
2326

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/NumberRule.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/NumberRule.java

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919

2020
/**
2121
* An implementation of <code>IRule</code> detecting a numerical value.
22+
* Originally since unknown version, but moved to org.eclipse.text in 3.14
23+
*
24+
* @since 3.14
2225
*/
2326
public class NumberRule implements IRule {
2427

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/PatternRule.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/PatternRule.java

+3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
* the pattern can be constrained to begin in a certain column. The rule can also
2929
* be used to check whether the text to scan covers half of the pattern, i.e. contains
3030
* the end sequence required by the rule.
31+
* Originally since unknown version, but moved to org.eclipse.text in 3.14
32+
*
33+
* @since 3.14
3134
*/
3235
public class PatternRule implements IPredicateRule {
3336

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
* the given content type.
2727
* </p>
2828
*
29-
* @since 2.0
29+
* Originally since 2.0, but moved to org.eclipse.text in 3.14
30+
*
31+
* @since 3.14
3032
*/
3133
public class RuleBasedPartitionScanner extends BufferedRuleBasedScanner implements IPartitionTokenScanner {
3234

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedPartitioner.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/RuleBasedPartitioner.java

+3
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@
4646
* as their data. The partitioner remembers the document's partitions
4747
* in the document itself rather than maintaining its own data structure.
4848
*
49+
* Originally since unknown version, but moved to org.eclipse.text in 3.14
50+
*
51+
* @since 3.14
4952
* @see IRule
5053
* @see RuleBasedScanner
5154
*

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedScanner.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/RuleBasedScanner.java

+3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
* of the file is reached. In this case the token returns <code>true</code> when calling
3232
* <code>isEOF</code>.
3333
*
34+
* Originally since unknown version, but moved to org.eclipse.text in 3.14
35+
*
36+
* @since 3.14
3437
* @see IRule
3538
*/
3639
public class RuleBasedScanner implements ICharacterScanner, ITokenScanner {

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/SingleLineRule.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/SingleLineRule.java

+3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
* the pattern begins with a specific sequence and may
2121
* end with a specific sequence, but will not span more
2222
* than a single line.
23+
* Originally since unknown version, but moved to org.eclipse.text in 3.14
24+
*
25+
* @since 3.14
2326
*/
2427
public class SingleLineRule extends PatternRule {
2528

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/Token.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/Token.java

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919

2020
/**
2121
* Standard implementation of <code>IToken</code>.
22+
* Originally since unknown version, but moved to org.eclipse.text in 3.14
23+
*
24+
* @since 3.14
2225
*/
2326
public class Token implements IToken {
2427

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WhitespaceRule.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/WhitespaceRule.java

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
* A whitespace rule uses a whitespace detector in order to find out which
2424
* characters are whitespace characters.
2525
*
26+
* Originally since unknown version, but moved to org.eclipse.text in 3.14
27+
*
28+
* @since 3.14
2629
* @see IWhitespaceDetector
2730
*/
2831
public class WhitespaceRule implements IRule {

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WordPatternRule.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/WordPatternRule.java

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
* A specific single line rule which stipulates that the start
2323
* and end sequence occur within a single word, as defined by a word detector.
2424
*
25+
* Originally since unknown version, but moved to org.eclipse.text in 3.14
26+
*
27+
* @since 3.14
2528
* @see IWordDetector
2629
*/
2730
public class WordPatternRule extends SingleLineRule {

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WordRule.java renamed to bundles/org.eclipse.text/src/org/eclipse/jface/text/rules/WordRule.java

+3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
* matches, but also for the generalized notion of a word in the context in which it is used. A word
2727
* rule uses a word detector to determine what a word is.
2828
*
29+
* Originally since unknown version, but moved to org.eclipse.text in 3.14
30+
*
31+
* @since 3.14
2932
* @see IWordDetector
3033
*/
3134
public class WordRule implements IRule {

0 commit comments

Comments
 (0)