@openui5/sap.ui.codeeditor 1.94.0 → 1.97.0

package/.reuse/dep5

@@ -309,7 +309,7 @@ License: MIT
 Comment: these files belong to: lodash
 
 Files: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
-Copyright: 2018 Mathias Nater
+Copyright: 2021 Mathias Nater
 License: MIT
 Comment: these files belong to: Hyphenopoly
 
@@ -347,11 +347,6 @@ Copyright: 2013 Ariya Hidayat and other contributors
 License: BSD-2-Clause
 Comment: these files belong to: Esprima
 
-Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/google-code-prettify/*
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-Comment: these files belong to: google-code-prettify
-
 Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/highlight.js/*
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -405,6 +400,11 @@ Copyright: 2014 Vitaly Puzrin, Alex Kocharin
 License: MIT
 Comment: these files belong to: Markdown-it
 
+Files: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+Copyright: 2015-2017 Evgeny Poberezkin
+License: MIT
+Comment: these files belong to: ajv
+
 
 # Library: sap.ui.mdc:
 
@@ -418,7 +418,7 @@ Comment: these files contain content from SAP and BooleanExpressionEvaluator: Bo
 
 # Library: sap.ui.webc.common:
 
-Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theme-base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
+Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theming/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 Copyright: SAP
 License: Apache-2.0
 Comment: these files belong to: UI5 Web Components
@@ -452,11 +452,6 @@ Copyright: 2009-2014, Alexis Sellier <self@cloudhead.net>
 License: Apache-2.0
 Comment: these files belong to: LESS
 
-Files: ../test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-Copyright: 2015-2017 Evgeny Poberezkin
-License: MIT
-Comment: these files belong to: ajv
-
 Files: lib/jsdoc/ui5/plugin.js
 Copyright:
     2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
@@ -464,3 +459,8 @@ Copyright:
 License: Apache-2.0
 Comment: these files contain content from SAP and JSDoc 3: plugin.js is overall written by SAP, but contains code taken from JSDoc 3.6.7 (see the respective comments)
 
+Files: src/sap.ui.core/src/sap/ui/core/themes/base/base.less src/themelib_sap_belize/src/sap/ui/core/themes/*/base.less src/themelib_sap_fiori_3/src/sap/ui/core/themes/*/base.less src/themelib_sap_horizon/src/sap/ui/core/themes/*/base.less
+Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
+License: Apache-2.0
+Comment: these files belong to: SAP Theming Base Content
+

package/THIRDPARTY.txt

@@ -6,7 +6,7 @@ The full text of all referenced licenses is appended at the end of this file.
 
 Library: sap.ui.codeeditor:
 
-Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.4
+Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.13
 Copyright: 2010, Ajax.org B.V.
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -197,7 +197,7 @@ License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/sinon-qunit.js
 
-Component: URI.js, version: 1.19.6
+Component: URI.js, version: 1.19.7
 Copyright: Rodney Rehm
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
@@ -279,8 +279,8 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/base/util/restricted/_/lodash.custom.js
 
-Component: Hyphenopoly, version: 2.4.0
-Copyright: 2018 Mathias Nater
+Component: Hyphenopoly, version: 3.4.0
+Copyright: 2021 Mathias Nater
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
@@ -324,12 +324,6 @@ License: BSD-2-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-2-Clause.txt
 Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/esprima.js
 
-Component: google-code-prettify, version: 20130304
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
-Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/google-code-prettify/*
-
 Component: highlight.js, version: 10.4.1
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -395,6 +389,12 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/markdown-it.js
 
+Component: ajv, version: 6.12.3
+Copyright: 2015-2017 Evgeny Poberezkin
+License: MIT
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
+Contained in: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+
 
 Library: sap.ui.mdc:
 
@@ -412,10 +412,11 @@ Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.*
-	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theme-base/*.*
+	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theming/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
+	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 
 Component: lit-html, version: 1.4.1
 Copyright: Google LLC
@@ -450,18 +451,21 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/testsuite-utils/src/main/resources/META-INF/less/less.js
 
-Component: ajv, version: 6.12.3
-Copyright: 2015-2017 Evgeny Poberezkin
-License: MIT
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: ../test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-
 Component: JSDoc 3, version: 3.6.7
 Copyright: 2011-present Michael Mathews micmath@gmail.com and the contributors to JSDoc
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
+Component: SAP Theming Base Content, version: 11.1.34
+Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
+License: Apache-2.0
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
+Contained in: src/sap.ui.core/src/sap/ui/core/themes/base/base.less
+	src/themelib_sap_belize/src/sap/ui/core/themes/*/base.less
+	src/themelib_sap_fiori_3/src/sap/ui/core/themes/*/base.less
+	src/themelib_sap_horizon/src/sap/ui/core/themes/*/base.less
+
 
 ALL LICENSE TEXTS:
 ==================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.codeeditor",
-  "version": "1.94.0",
+  "version": "1.97.0",
   "description": "OpenUI5 UI Library sap.ui.codeeditor",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,6 +14,6 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.94.0"
+    "@openui5/sap.ui.core": "1.97.0"
   }
 }

package/src/sap/ui/codeeditor/.library

@@ -6,7 +6,7 @@
 	<copyright>OpenUI5
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-	<version>1.94.0</version>
+	<version>1.97.0</version>
 
 	<documentation>UI5 library: sap.ui.codeeditor</documentation>
 
@@ -38,11 +38,11 @@
 		</packaging>
 		<!-- Thirdparty references -->
 		<thirdparty xmlns="http://www.sap.com/ui5/buildext/thirdparty" >
-				<lib name="ace" displayName="Ace (Ajax.org Cloud9 Editor)" version="1.4.4" homepage="https://ace.c9.io/">
-					<license url="https://github.com/ajaxorg/ace/blob/master/LICENSE" type="BSD-3-Clause" />
-					<copyright>2010, Ajax.org B.V.</copyright>
-					<pattern>sap/ui/codeeditor/js/ace/*</pattern>
-				</lib>
+			<lib name="ace" displayName="Ace (Ajax.org Cloud9 Editor)" version="1.4.13" homepage="https://ace.c9.io/">
+				<license url="https://github.com/ajaxorg/ace/blob/master/LICENSE" type="BSD-3-Clause" />
+				<copyright>2010, Ajax.org B.V.</copyright>
+				<pattern>sap/ui/codeeditor/js/ace/*</pattern>
+			</lib>
 		</thirdparty>
 		<!-- Demokit content -->
 		<documentation xmlns="http://www.sap.com/ui5/buildext/documentation"

package/src/sap/ui/codeeditor/CodeEditor.js

@@ -30,6 +30,7 @@ sap.ui.define([
 	"sap/ui/core/Control",
 	"sap/ui/core/RenderManager",
 	"sap/ui/core/ResizeHandler",
+	"sap/ui/dom/includeStylesheet",
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/codeeditor/js/ace/ace",
 	"sap/ui/codeeditor/js/ace/ext-language_tools",
@@ -42,6 +43,7 @@ sap.ui.define([
 	Control,
 	RenderManager,
 	ResizeHandler,
+	includeStylesheet,
 	jQuery,
 	ace
 ) {
@@ -55,16 +57,13 @@ sap.ui.define([
 	 *
 	 * @class
 	 * Allows to visualize source code of various types with syntax highlighting, line numbers in editable and read only mode.
-	 * Use this controls in scenarios where the user should be able to inspect and edit source code.
+	 * Use this control in scenarios where the user should be able to inspect and edit source code.
 	 * The control currently uses the third-party code editor Ace.
-	 * NOTE: There is a known limitation where CodeEditor won't work within IconTabBar on Internet Explorer. There
-	 * is a way to achieve the same functionality - an example of IconTabHeader and a CodeEditor can be found
-	 * in the CodeEditor's samples.
 	 *
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public
@@ -76,11 +75,11 @@ sap.ui.define([
 			library: "sap.ui.codeeditor",
 			properties: {
 				/**
-				 * The value displayed in the code editor
+				 * The value displayed in the code editor.
 				 */
 				value: { type: "string", group: "Misc", defaultValue: "" },
 				/**
-				 * The type of the code in the editor used for syntax highlighting
+				 * The type of the code in the editor used for syntax highlighting.
 				 * Possible types are: abap, abc, actionscript, ada, apache_conf, applescript, asciidoc, assembly_x86,
 				 * autohotkey, batchfile, bro, c9search, c_cpp, cirru, clojure, cobol, coffee, coldfusion, csharp, css,
 				 * curly, d, dart, diff, django, dockerfile, dot, drools, eiffel, ejs, elixir, elm, erlang, forth, fortran,
@@ -92,11 +91,11 @@ sap.ui.define([
 				 * razor, rdoc, rhtml, rst, ruby, rust, sass, scad, scala, scheme, scss, sh, sjs, smarty, snippets,
 				 * soy_template, space, sql, sqlserver, stylus, svg, swift, swig, tcl, tex, text, textile, toml, tsx,
 				 * twig, typescript, vala, vbscript, velocity, verilog, vhdl, wollok, xml, xquery, yaml, terraform, slim, redshift,
-				 * red, puppet, php_laravel_blade, mixal, jssm, fsharp, edifact, csp, cssound_score, cssound_orchestra, cssound_document,
+				 * red, puppet, php_laravel_blade, mixal, jssm, fsharp, edifact, csp, cssound_score, cssound_orchestra, cssound_document
 				 */
 				type: { type: "string", group: "Appearance", defaultValue: "javascript" },
 				/**
-				 * The width of the code editor
+				 * The width of the code editor.
 				 */
 				width: { type: "sap.ui.core.CSSSize", group: "Appearance", defaultValue: "100%" },
 				/**
@@ -105,15 +104,15 @@ sap.ui.define([
 				 */
 				height: { type: "sap.ui.core.CSSSize", group: "Appearance", defaultValue: "100%" },
 				/**
-				 * Sets whether the code in the editor can be changed by the user
+				 * Sets whether the code in the editor can be changed by the user.
 				 */
 				editable: { type: "boolean", group: "Behavior", defaultValue: true },
 				/**
-				 * Sets whether line numbers should be shown
+				 * Sets whether line numbers should be shown.
 				 */
 				lineNumbers: { type: "boolean", group: "Behavior", defaultValue: true },
 				/**
-				 * Sets whether the code is automatically selected if a value is set
+				 * Sets whether the code is automatically selected if a value is set.
 				 */
 				valueSelection: { type: "boolean", group: "Behavior", defaultValue: false },
 				/**
@@ -127,7 +126,7 @@ sap.ui.define([
 				 */
 				maxLines: { type: "int", group: "Behavior", defaultValue: 0 },
 				/**
-				 * Sets the editors color theme
+				 * Sets the editor color theme.
 				 * Possible values are: default, hcb, hcb_bright, hcb_blue,
 				 * theme-ambiance, chaos, chrome, clouds, clouds_midnight, cobalt, crimson_editor, dawn, dreamweaver, eclipse,
 				 * github, gob, gruvbox, idle_fingers, iplastic, katzenmilch, kr_theme, kuroir, merbivore, merbivore_soft,
@@ -137,7 +136,7 @@ sap.ui.define([
 				 */
 				colorTheme: { type: "string", group: "Behavior", defaultValue: "default" },
 				/**
-				 * Sets whether to show syntax hints the editor. This flag is only available if line numbers are shown.
+				 * Sets whether to show syntax hints in the editor. This flag is only available if line numbers are shown.
 				 */
 				syntaxHints: { type: "boolean", group: "Behavior", defaultValue: true }
 			},
@@ -201,6 +200,8 @@ sap.ui.define([
 	//configure the source paths
 	var sPath = sap.ui.require.toUrl("sap/ui/codeeditor/js/ace");
 	ace.config.set("basePath", sPath);
+	ace.config.set("loadWorkerFromBlob", false);
+	ace.config.set("useStrictCSP", true);
 
 	// require language tools
 	var oLangTools = ace.require("ace/ext/language_tools");
@@ -212,6 +213,7 @@ sap.ui.define([
 		this._bIsRenderingPhase = false;
 
 		this._oEditorDomRef = document.createElement("div");
+		this._oEditorDomRef.id = this.getId() + "-editor";
 		this._oEditorDomRef.style.height = "100%";
 		this._oEditorDomRef.style.width = "100%";
 
@@ -227,6 +229,11 @@ sap.ui.define([
 		oSession.setUseWrapMode(true);
 		oSession.setMode("ace/mode/javascript");
 
+		includeStylesheet(
+			sap.ui.require.toUrl("sap/ui/codeeditor/js/ace/css/ace.css"),
+			"sap-ui-codeeditor-ace"
+		);
+
 		var sUiTheme = Core.getConfiguration().getTheme().toLowerCase();
 		var sEditorTheme = "tomorrow";
 		if (sUiTheme.indexOf("hcb") > -1) {
@@ -238,7 +245,7 @@ sap.ui.define([
 		} else if (sUiTheme === "sap_fiori_3_dark") {
 			sEditorTheme = "clouds_midnight";
 		}
-		this._oEditor.setTheme("ace/theme/" + sEditorTheme);
+		this.setColorTheme(sEditorTheme);
 
 		this._oEditor.setOptions({
 			enableBasicAutocompletion: true,
@@ -358,6 +365,18 @@ sap.ui.define([
 		this._registerResizeListener();
 	};
 
+	/**
+	 * Returns the DOMNode ID to be used for the "labelFor" attribute of the label.
+	 *
+	 * By default, this is the ID of the control itself.
+	 *
+	 * @return {string} ID to be used for the <code>labelFor</code>
+	 * @public
+	 */
+	CodeEditor.prototype.getIdForLabel = function () {
+		return this.getId() + "-editor-textarea";
+	};
+
 	/**
 	 * @private
 	 */
@@ -400,6 +419,7 @@ sap.ui.define([
 	 */
 	CodeEditor.prototype.setColorTheme = function(sTheme) {
 		this.setProperty("colorTheme", sTheme, true);
+
 		if (sTheme === "default") {
 			sTheme = "tomorrow";
 		} else if (sTheme === "hcb") {
@@ -409,7 +429,13 @@ sap.ui.define([
 		} else if (sTheme === "hcb_blue") {
 			sTheme = "tomorrow_night_blue";
 		}
+
 		this._oEditor.setTheme("ace/theme/" + sTheme);
+		includeStylesheet(
+			sap.ui.require.toUrl("sap/ui/codeeditor/js/ace/css/theme/" + sTheme + ".css"),
+			"sap-ui-codeeditor-theme-" + sTheme
+		);
+
 		return this;
 	};
 	/**