| A | - | (Alphanumeric) | Returns 1 if String only contains characters from the ranges 'a-z', 'A-Z', and '0-9'. |
| B | - | (Binary) | Returns 1 if String only contains the characters '0' and/or '1'. |
| L | - | (lower case) | Returns 1 if String only contains characters from the range 'a-z'. |
| M | - | (Mixed Case) | Returns 1 if String only contains characters from the ranges 'a-z' and 'A-Z'. |
| N | - | (Number) | Returns 1 if DATATYPE(String) would return 'NUM'. |
| S | - | (Symbol) | Returns 1 if String only contains characters that are valid in REXX symbols. Note that lower case alphabetics are permitted. |
| U | - | (UPPER CASE) | Returns 1 if String only contains characters from the range 'A-Z'. |
| W | - | (Whole Number) | Returns 1 if String is a REXX whole number under the current setting of NUMERIC DIGITS. |
| X | - | (heXadecimal) | Returns 1 if String only contains characters from the ranges 'a-f', 'A-F', '0-9', and blank (so long as blanks only appear between pairs of hexadecimal characters, as usual.) Also returns 2 if String is a null string, which is a valid hexadecimal string. |
"
+ }
+ ],
+ "examples": [
+ "DATATYPE('l2.3','N') == 1",
+ "DATATYPE('12.3','W') == 0",
+ "DATATYPE('Fred','M') == 1",
+ "DATATYPE('','M') == 0",
+ "DATATYPE('Minx','L') == 0",
+ "DATATYPE('3d?','s') == 1",
+ "DATATYPE('BCd3','X') == 1",
+ "DATATYPE('BC d3','X') == 1"
+ ],
+ "additionalInfo": "Type of String."
+ },
+ {
+ "pattern": "FUNCTION_NAME()",
+ "returnValue": {
+ "type": "",
+ "description": ""
+ },
+ "variables": [
+ {
+ "type": "",
+ "defaultValue": "",
+ "offsets": [
+ 0
+ ],
+ "variableDescription": ""
+ }
+ ],
+ "examples": [
+ ""
+ ],
+ "additionalInfo": ""
+ },
+ //TODO: C2D, C2X, DATATYPE, DATE, DELSTR, DELWORD, DIGITS< D2C, D2X, ERRORTEXT, FORM, FORMAT, FORMAT (v2), FUZZ, INSERT, LASTPOS, LEFT< LENGTH, LINEIN, Lineout, LINES, MAX, MIN, OVERLAY
{
"pattern": "POS(Needle,Haystack)",
"returnValue": {
@@ -331,6 +1032,7 @@
],
"additionalInfo": "Position of starting at."
},
+ //TODO: QUEUED, RANDOM, REVERSE, RIGHT, SIGN< SOURCELINE, SPACE< STREAM< STRIP, SUBSTR, SUBWORD, SYMBOL, TIME, TRACE, TRANSLATE, TRUNC, VALUE, VERIFY, WORD< WORDINDEX< WORDLENGTH, WORDPOS, WORDS, XRANGE, X2B, X3C, X2D
{
"pattern": "FUNCTION_NAME()",
"returnValue": {
@@ -352,4 +1054,4 @@
],
"additionalInfo": ""
}
-]
\ No newline at end of file
+]
diff --git a/resources/configuration/tbl.html b/resources/configuration/tbl.html
new file mode 100644
index 0000000..605f606
--- /dev/null
+++ b/resources/configuration/tbl.html
@@ -0,0 +1,129 @@
+
+
+ |
+ A
+ |
+
+ -
+ |
+
+ (Alphanumeric)
+ |
+
+ Returns 1 if String only contains characters from the ranges 'a-z', 'A-Z', and '0-9'.
+ |
+
+
+ |
+ B
+ |
+
+ -
+ |
+
+ (Binary)
+ |
+
+ Returns 1 if String only contains the characters '0' and/or '1'.
+ |
+
+
+ |
+ L
+ |
+
+ -
+ |
+
+ (lower case)
+ |
+
+ Returns 1 if String only contains characters from the range 'a-z'.
+ |
+
+
+ |
+ M
+ |
+
+ -
+ |
+
+ (Mixed Case)
+ |
+
+ Returns 1 if String only contains characters from the ranges 'a-z' and 'A-Z'.
+ |
+
+
+ |
+ N
+ |
+
+ -
+ |
+
+ (Number)
+ |
+
+ Returns 1 if DATATYPE(String) would return 'NUM'.
+ |
+
+
+ |
+ S
+ |
+
+ -
+ |
+
+ (Symbol)
+ |
+
+ Returns 1 if String only contains characters that are valid in REXX symbols. Note that lower case alphabetics are permitted.
+
+ |
+
+
+ |
+ U
+ |
+
+ -
+ |
+
+ (UPPER CASE)
+ |
+
+ Returns 1 if String only contains characters from the range 'A-Z'.
+ |
+
+
+ |
+ W
+ |
+
+ -
+ |
+
+ (Whole Number)
+ |
+
+ Returns 1 if String is a REXX whole number under the current setting of NUMERIC DIGITS.
+ |
+
+
+ |
+ X
+ |
+
+ -
+ |
+
+ (heXadecimal)
+ |
+
+ Returns 1 if String only contains characters from the ranges "a-f', "A-F", "0-9", and blank (so long as blanks only appear between pairs of hexadecimal characters, as usual.) Also returns 1 if String is a null string, which is a valid hexadecimal string.
+ |
+
+
\ No newline at end of file
diff --git a/src/org/imperfectmommy/rexxeditor/contentassist/RexxContentAssistProcessor.java b/src/org/imperfectmommy/rexxeditor/contentassist/RexxContentAssistProcessor.java
index 3d85159..47efb7c 100644
--- a/src/org/imperfectmommy/rexxeditor/contentassist/RexxContentAssistProcessor.java
+++ b/src/org/imperfectmommy/rexxeditor/contentassist/RexxContentAssistProcessor.java
@@ -40,32 +40,43 @@ public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int
IDocument document = viewer.getDocument();
FindReplaceDocumentAdapter adapter = new FindReplaceDocumentAdapter(document);
String foundString = "";
+ IRegion region2 = null;
try {
- IRegion region2 = adapter.find(offset - 1,"\\s", false, false, false, true);
- foundString = document.get(region2.getOffset() + 1, offset - region2.getOffset() - 1);
+ region2 = adapter.find(offset - 1,"\\s", false, false, false, true);
+ region2 = new Region(region2.getOffset() + 1, region2.getLength());
+ foundString = document.get(region2.getOffset(), offset - region2.getOffset());
} catch (BadLocationException e1) {
e1.printStackTrace();
}
- final String finalFoundString = foundString;
+ final String finalFoundString = foundString.toUpperCase();
List