@elyra/canvas 12.40.1 → 12.42.0

package/src/common-properties/controls/expression/languages/CLEM-hint.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 Elyra Authors
+ * Copyright 2017-2024 Elyra Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,10 @@
  */
 
 /* eslint no-useless-escape: "off" */
+import { LanguageSupport, StreamLanguage } from "@codemirror/language";
+import { completeFromList } from "@codemirror/autocomplete";
 
-let CodeMirror;
-function register(cm) {
-	CodeMirror = cm;
-	CodeMirror.registerHelper("hint", "CLEM", CLEMHint);
-	CodeMirror.defineMode("CLEM", defineMode);
-	CodeMirror.defineMIME("text/x-CLEM", "CLEM");
-}
-
-const CLEMKeywords = ("@BLANK @DIFF1 @DIFF2 @FIELD @FIELDS_BETWEEN @FIELDS_MATCHING " +
+const keywords = ("@BLANK @DIFF1 @DIFF2 @FIELD @FIELDS_BETWEEN @FIELDS_MATCHING " +
 "@GLOBAL_MAX @GLOBAL_MEAN @GLOBAL_MIN @GLOBAL_SDEV @GLOBAL_SUM @INDEX @LAST_NON_BLANK " +
 "@MAX @MEAN @MIN @MULTI_RESPONSE_SET @NULL @OFFSET @PARTITION_FIELD @PREDICTED " +
 "@SDEV @SINCE @SINCE0 @SUM @TARGET @TESTING_PARTITION @THIS @TODAY @TRAINING_PARTITION " +
@@ -50,173 +44,106 @@ const CLEMKeywords = ("@BLANK @DIFF1 @DIFF2 @FIELD @FIELDS_BETWEEN @FIELDS_MATCH
 "substring_between sum_n tan tanh testbit time_before time_hours_difference time_in_hours " +
 "time_in_mins time_in_secs time_mins_difference").split(" ");
 
-function CLEMHint(editor, options) {
-	return scriptHint(editor, CLEMKeywords,
-		function(e, cur) {
-			return e.getTokenAt(cur);
-		},
-		options);
-}
+const clemKeywords = keywords.map((keyword) => ({ label: keyword, type: "keyword" }));
 
-function scriptHint(editor, keywords, getToken, options) {
-	// Find the token at the cursor
-	var cur = editor.getCursor();
-	var token = getToken(editor, cur);
-	if ((/\b(?:string|comment)\b/).test(token.type)) {
-		return null;
+const isSpecialChar = /[\[\]{}\(\),;\:\.]/;
+const isDigit = /\d/;
+const isNumberChar = /[\w\.]/;
+const isWordChar = /[\w\$_]/;
+const isOperatorChar = /[+\-*&%=<>!?|\/]/;
+
+function tokenResolve(stream, state) {
+	const ch = stream.next();
+	if (ch === "#" && state.startOfLine) {
+		stream.skipToEnd();
+		return "meta";
 	}
-	token.state = CodeMirror.innerMode(editor.getMode(), token.state).state;
-
-	// If it's not a 'word-style' token, ignore the token.
-	if (!((/^[\w$_@]*$/).test(token.string))) {
-		token = { start: cur.ch, end: cur.ch, string: "", state: token.state,
-			type: token.string === "." ? "property" : null };
-	} else if (token.end > cur.ch) {
-		token.end = cur.ch;
-		token.string = token.string.slice(0, cur.ch - token.start);
+
+	if (ch === "\"") {
+		tokenString(ch, stream, state);
+		return "string";
 	}
 
-	return { list: getAutoCompletions(token, keywords, options),
-		from: CodeMirror.Pos(cur.line, token.start),
-		to: CodeMirror.Pos(cur.line, token.end) };
-}
+	if (ch === "'") {
+		tokenVariable(ch, stream, state);
+		return "variable";
+	}
 
-function getAutoCompletions(token, keywords, options) {
-	var found = [];
-	var start = token.string;
+	if (isSpecialChar.test(ch)) {
+		return null;
+	}
 
-	for (var indx = 0; indx < keywords.length; indx++) {
-		if (keywords[indx].lastIndexOf(start, 0) === 0 && (found.indexOf(keywords[indx]) === -1)) {
-			found.push(keywords[indx]);
-		}
+	if (isDigit.test(ch)) {
+		stream.eatWhile(isNumberChar);
+		return "number";
+	}
+	if (isOperatorChar.test(ch)) {
+		stream.eatWhile(isOperatorChar);
+		return "operator";
 	}
 
-	return found;
+	stream.eatWhile(isWordChar);
+	const cur = stream.current();
+	if (keywords.indexOf(cur) !== -1) {
+		return "keyword";
+	}
+	return "variable";
 }
 
-
-function defineMode() {
-
-	var keywords = ("@BLANK @DIFF1 @DIFF2 @FIELD @FIELDS_BETWEEN @FIELDS_MATCHING " +
-	"@GLOBAL_MAX @GLOBAL_MEAN @GLOBAL_MIN @GLOBAL_SDEV @GLOBAL_SUM @INDEX @LAST_NON_BLANK " +
-	"@MAX @MEAN @MIN @MULTI_RESPONSE_SET @NULL @OFFSET @PARTITION_FIELD @PREDICTED " +
-	"@SDEV @SINCE @SINCE0 @SUM @TARGET @TESTING_PARTITION @THIS @TODAY @TRAINING_PARTITION " +
-	"@VALIDATION_PARTITION abs allbutfirst allbutlast alphabefore and arccos arccosh arcsin " +
-	"arcsinh arctan arctan2 arctanh area cdf_chisq cdf_f cdf_normal cdf_t close_to COND1 " +
-	"and COND2 COND1 or COND2 cos cosh count_equal count_greater_than count_less_than " +
-	"count_non_nulls count_not_equal count_nulls count_substring crosses date_before " +
-	"date_days_difference date_from_ywd date_in_days date_in_months date_in_weeks date_in_years " +
-	"date_iso_day date_iso_week date_iso_year date_months_difference date_weeks_difference " +
-	"date_years_difference datetime_date datetime_day datetime_day_name datetime_day_short_name " +
-	"datetime_hour datetime_in_seconds datetime_minute datetime_month datetime_month_name " +
-	"datetime_month_short_name datetime_now datetime_second datetime_time datetime_timestamp " +
-	"datetime_weekday datetime_year distance div endstring exp first_index first_non_null " +
-	"first_non_null_index fracof hasendstring hasmidstring hasstartstring hassubstring hassubstring " +
-	"if then else elseif endif integer_bitcount integer_leastbit integer_length intof is_date " +
-	"is_datetime is_integer is_number is_real is_string is_time is_timestamp isalphacode " +
-	"isendstring islowercode ismidstring isnumbercode isstartstring issubstring issubstring " +
-	"issubstring_count issubstring_lim isuppercode last last_index last_non_null last_non_null_index " +
-	"length locchar locchar_back log log10 lowertoupper max max_index max_n MEAN mean_n member " +
-	"min min_index min_n negate not num_points oneof or overlap pi random random0 rem replace " +
-	"replicate round sdev_n sign sin sinh skipchar skipchar_back soundex soundex_difference sqrt " +
-	"startstring stb_centroid_latitude stb_centroid_longitude stripchar strmember subscrs substring " +
-	"substring_between sum_n tan tanh testbit time_before time_hours_difference time_in_hours " +
-	"time_in_mins time_in_secs time_mins_difference").split(" ");
-
-	var isSpecialChar = /[\[\]{}\(\),;\:\.]/;
-	var isDigit = /\d/;
-	var isNumberChar = /[\w\.]/;
-	var isWordChar = /[\w\$_]/;
-
-	var isOperatorChar = /[+\-*&%=<>!?|\/]/;
-
-	function tokenResolve(stream, state) {
-		var ch = stream.next();
-		if (ch === "#" && state.startOfLine) {
-			stream.skipToEnd();
-			return "meta";
+function tokenString(quote, stream, state) {
+	let next;
+	let end = false;
+	while (typeof (next = stream.next()) !== "undefined") {
+		if (next === quote) {
+			end = true;
+			break;
 		}
-
-		if (ch === "\"") {
-			tokenString(ch, stream, state);
-			return "string";
-		}
-
-		if (ch === "'") {
-			tokenVariable(ch, stream, state);
-			return "variable";
-		}
-
-		if (isSpecialChar.test(ch)) {
-			return null;
-		}
-
-		if (isDigit.test(ch)) {
-			stream.eatWhile(isNumberChar);
-			return "number";
-		}
-		if (isOperatorChar.test(ch)) {
-			stream.eatWhile(isOperatorChar);
-			return "operator";
-		}
-
-		stream.eatWhile(isWordChar);
-		var cur = stream.current();
-		if (keywords.indexOf(cur) !== -1) {
-			return "keyword";
-		}
-		return "variable";
 	}
-
-	function tokenString(quote, stream, state) {
-		var next;
-		var end = false;
-		while (typeof (next = stream.next()) !== "undefined") {
-			if (next === quote) {
-				end = true;
-				break;
-			}
-		}
-		if (end) {
-			state.tokenize = null;
-		}
-		return "string";
+	if (end) {
+		state.tokenize = null;
 	}
+	return "string";
+}
 
-	function tokenVariable(quote, stream, state) {
-		var next;
-		var end = false;
-		while (typeof (next = stream.next()) !== "undefined") {
-			if (next === quote) {
-				end = true;
-				break;
-			}
-		}
-		if (end) {
-			state.tokenize = null;
+function tokenVariable(quote, stream, state) {
+	let next;
+	let end = false;
+	while (typeof (next = stream.next()) !== "undefined") {
+		if (next === quote) {
+			end = true;
+			break;
 		}
-		return "variable";
 	}
+	if (end) {
+		state.tokenize = null;
+	}
+	return "variable";
+}
 
-	// Required implementation
-
-	return {
-		startState: function() {
-			return { tokenize: null };
-		},
-
-		token: function(stream, state) {
-			if (stream.eatSpace()) {
-				return null;
-			}
-			var style = (state.tokenize || tokenResolve)(stream, state);
-			return style;
-		},
-
-		electricChars: "{}"
-	};
+// Define CLEM language
+const clemLanguage = StreamLanguage.define({
+	name: "CLEM",
+	startState: function() {
+		return { tokenize: null };
+	},
+	token: function(stream, state) {
+		if (stream.eatSpace()) {
+			return null;
+		}
+		const style = (state.tokenize || tokenResolve)(stream, state);
+		return style;
+	},
+});
+
+// Autocompletions
+const clemCompletion = clemLanguage.data.of({
+	autocomplete: completeFromList(clemKeywords)
+});
+
+function clem() {
+	return new LanguageSupport(clemLanguage, [clemCompletion]);
 }
 
 export {
-	register
+	clem
 };

package/src/common-properties/controls/expression/languages/python-hint.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 Elyra Authors
+ * Copyright 2017-2024 Elyra Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,110 +14,59 @@
  * limitations under the License.
  */
 
-let CodeMirror;
-function register(cm) {
-	CodeMirror = cm;
-	CodeMirror.registerHelper("hint", "python", pythonHint);
-}
-
-
-function forEach(arr, f) {
-	for (var e = arr.length, i = 0; i < e; ++i) {
-		f(arr[i]);
-	}
-}
-
-function arrayContains(arr, item) {
-	if (!Array.prototype.indexOf) {
-		var i = arr.length;
-		while (i--) {
-			if (arr[i] === item) {
-				return true;
-			}
-		}
-		return false;
-	}
-	return arr.indexOf(item) !== -1;
-}
-
-function scriptHint(editor, _keywords, getToken) {
-	var cur = editor.getCursor();
-	var token = getToken(editor, cur);
-	var tprop = token;
-	var context;
-	// ignore irregular word tokens
-	if (!(/^[\w$_]*$/).test(token.string)) {
-		token = tprop = { start: cur.ch, end: cur.ch, string: "", state: token.state,
-			className: token.string === ":" ? "python-type" : null };
-	}
-	if (!context) {
-		context = [];
-	}
-	context.push(tprop);
-
-	var completionList = getCompletions(token, context);
-	completionList.sort();
-
-	return { list: completionList,
-		from: CodeMirror.Pos(cur.line, token.start),
-		to: CodeMirror.Pos(cur.line, token.end) };
-}
-
-function pythonHint(editor) {
-	return scriptHint(editor, pythonKeywordsL, function(e, cur) {
-		return e.getTokenAt(cur);
-	});
-}
-
-
-var pythonKeywords = "and del from not while as elif global or with assert else if pass yield" +
-"break except import print class exec in raise continue finally is return def for lambda try";
-var pythonKeywordsL = pythonKeywords.split(" ");
-
-var pythonBuiltins = "abs divmod input open staticmethod all enumerate int ord str " +
-"any eval isinstance pow sum basestring execfile issubclass print super" +
-"bin file iter property tuple bool filter len range type" +
-"bytearray float list raw_input unichr callable format locals reduce unicode" +
-"chr frozenset long reload vars classmethod getattr map repr xrange" +
-"cmp globals max reversed zip compile hasattr memoryview round __import__" +
-"complex hash min set apply delattr help next setattr buffer" +
-"dict hex object slice coerce dir id oct sorted intern ";
-var pythonBuiltinsL = pythonBuiltins.split(" ").join("() ")
-	.split(" ");
-
-function getCompletions(token, context) {
-	var found = [];
-	var start = token.string;
-	function maybeAdd(str) {
-		if (str.lastIndexOf(start, 0) === 0 && !arrayContains(found, str)) {
-			found.push(str);
-		}
-	}
-
-	function gatherCompletions(_obj) {
-		forEach(pythonBuiltinsL, maybeAdd);
-		forEach(pythonKeywordsL, maybeAdd);
-	}
-
-	if (context) {
-		var obj = context.pop();
-		var base = "";
-
-		if (obj.type === "variable") {
-			base = obj.string;
-		}	else if (obj.type === "variable-3") {
-			base = ":" + obj.string;
-		}
-		while (base !== null && context.length) {
-			base = base[context.pop().string];
-		}
-		if (base !== null) {
-			gatherCompletions(base);
-		}
-	}
-	return found;
+const pythonKeywords = [
+	"and",
+	"del",
+	"not",
+	"as",
+	"elif",
+	"global",
+	"or",
+	"with",
+	"assert",
+	"else",
+	"pass",
+	"yield",
+	"break",
+	"except",
+	"print",
+	"in",
+	"raise",
+	"continue",
+	"finally",
+	"is",
+	"return",
+	"lambda"
+];
+
+const pythonFunctions = [
+	"basestring()",
+	"execfile()",
+	"file()",
+	"raw_input()",
+	"unichr()",
+	"reduce()",
+	"unicode()",
+	"long()",
+	"reload()",
+	"xrange()",
+	"cmp()",
+	"apply()",
+	"buffer()",
+	"coerce()",
+	"intern()",
+];
+
+function getPythonHints() {
+	const pythonHints = [];
+
+	pythonKeywords.forEach((keyword) => pythonHints.push({ label: keyword, type: "keyword" }));
+
+	pythonFunctions.forEach((func) => pythonHints.push({ label: func, type: "function" }));
+
+	return pythonHints;
 }
 
 export {
-	register
+	getPythonHints
 };