Merge branch 'main' into 3660_PalleteCateg_Accessibility

srikant-ch5 · Feb 26, 2024 · 13ca164 · 13ca164
2 parents 4f0ef1e + b2b3184
commit 13ca164
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 37 deletions.
diff --git a/canvas_modules/common-canvas/rollup.config.js b/canvas_modules/common-canvas/rollup.config.js
@@ -31,6 +31,8 @@ export default {
 		"lib/properties": "./src/common-properties/index.js",
 		"lib/properties/field-picker": "./src/common-properties/components/field-picker/index.js",
 		"lib/properties/flexible-table": "./src/common-properties/components/flexible-table/index.js",
+		"lib/properties/clem": "./src/common-properties/controls/expression/languages/CLEM-hint.js",
+		"lib/properties/getPythonHints": "./src/common-properties/controls/expression/languages/python-hint.js",
 		"lib/context-menu": "./src/context-menu/context-menu-wrapper.jsx",
 		"lib/command-stack": "./src/command-stack/command-stack.js",
 		"lib/tooltip": "./src/tooltip/tooltip.jsx",

diff --git a/..._modules/common-canvas/src/common-properties/controls/expression/languages/python-hint.js b/..._modules/common-canvas/src/common-properties/controls/expression/languages/python-hint.js
@@ -14,48 +14,36 @@
  * limitations under the License.
  */
 
+// Ref: https://docs.python.org/3.12/reference/lexical_analysis.html#keywords
 const pythonKeywords = [
-	"and",
-	"del",
-	"not",
-	"as",
-	"elif",
-	"global",
-	"or",
-	"with",
-	"assert",
+	"await",
 	"else",
 	"pass",
-	"yield",
 	"break",
 	"except",
-	"print",
 	"in",
 	"raise",
-	"continue",
 	"finally",
 	"is",
 	"return",
-	"lambda"
+	"and",
+	"continue",
+	"lambda",
+	"as",
+	"nonlocal",
+	"assert",
+	"del",
+	"global",
+	"not",
+	"with",
+	"async",
+	"elif",
+	"or",
+	"yield"
 ];
 
-const pythonFunctions = [
-	"basestring()",
-	"execfile()",
-	"file()",
-	"raw_input()",
-	"unichr()",
-	"reduce()",
-	"unicode()",
-	"long()",
-	"reload()",
-	"xrange()",
-	"cmp()",
-	"apply()",
-	"buffer()",
-	"coerce()",
-	"intern()",
-];
+// Ref: https://docs.python.org/3/library/functions.html
+const pythonFunctions = [];
 
 function getPythonHints() {
 	const pythonHints = [];

diff --git a/canvas_modules/common-canvas/src/common-properties/controls/expression/languages/r-hint.js b/canvas_modules/common-canvas/src/common-properties/controls/expression/languages/r-hint.js
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-const keywords = "function|if|in|break|next|repeat|else|for" +
-	"|return|switch|while|try|tryCatch|stop|warning|require|library" +
-	"|attach|detach|source|setMethod|setGeneric|setGroupGeneric|setClass";
+// Ref: https://cran.r-project.org/doc/manuals/r-release/R-lang.html#Reserved-words
+// Search for "10.3.3 Reserved words"
+const keywords = "if|else|repeat|while|function|for|in|next|break" +
+	"|TRUE|FALSE|NULL|Inf|NaN|NA|NA_integer_|NA_real_|NA_complex_|NA_character_";
 
 const rKeywords = keywords.split("|");
 

diff --git a/canvas_modules/common-canvas/src/common-properties/index.js b/canvas_modules/common-canvas/src/common-properties/index.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.
@@ -18,5 +18,7 @@ import CommonProperties from "./common-properties";
 import PropertiesController from "./properties-controller";
 import FlexibleTable from "./components/flexible-table";
 import FieldPicker from "./components/field-picker";
+import { clem } from "./controls/expression/languages/CLEM-hint";
+import { getPythonHints } from "./controls/expression/languages/python-hint";
 
-export { CommonProperties, PropertiesController, FlexibleTable, FieldPicker };
+export { CommonProperties, PropertiesController, FlexibleTable, FieldPicker, clem, getPythonHints };
diff --git a/canvas_modules/common-canvas/src/index.js b/canvas_modules/common-canvas/src/index.js
@@ -15,7 +15,7 @@
  */
 
 import { CommonCanvas, CanvasController } from "./common-canvas/index";
-import { CommonProperties, PropertiesController, FieldPicker, FlexibleTable } from "./common-properties/index";
+import { CommonProperties, PropertiesController, FieldPicker, FlexibleTable, clem, getPythonHints } from "./common-properties/index";
 import CommandStack from "./command-stack/command-stack";
 import * as FlowValidation from "./flow-validation/validate-flow";
 import ContextMenuWrapper from "./context-menu/context-menu-wrapper";
@@ -30,6 +30,6 @@ import DisconnectObjectsAction from "../src/command-actions/disconnectObjectsAct
 import PasteAction from "../src/command-actions/pasteAction";
 
 
-export { CommonCanvas, CanvasController, CommonProperties, PropertiesController, FieldPicker, FlexibleTable,
+export { CommonCanvas, CanvasController, CommonProperties, PropertiesController, FieldPicker, FlexibleTable, clem, getPythonHints,
 	CommandStack, FlowValidation, ContextMenuWrapper, ToolTip, ColorPicker,
 	CreateAutoNodeAction, CreateNodeAction, CreateNodeLinkAction, DeleteObjectsAction, DisconnectObjectsAction, PasteAction };