Core: Avoid redeclaring variables in util.clone (#1778)

This changes util.clone to be more readable and to avoid redeclaring the `clone` and `id` variables.
PrismJS · Mar 1, 2019 · b06f532 · b06f532
1 parent 289ddd9
commit b06f532
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/components/prism-core.js b/components/prism-core.js
@@ -45,16 +45,16 @@ var _ = _self.Prism = {
 
 		// Deep clone a language definition (e.g. to extend it)
 		clone: function deepClone(o, visited) {
-			var type = _.util.type(o);
+			var clone, id, type = _.util.type(o);
 			visited = visited || {};
 
 			switch (type) {
 				case 'Object':
-					var id = _.util.objId(o);
+					id = _.util.objId(o);
 					if (visited[id]) {
 						return visited[id];
 					}
-					var clone = {};
+					clone = {};
 					visited[id] = clone;
 
 					for (var key in o) {
@@ -66,21 +66,22 @@ var _ = _self.Prism = {
 					return clone;
 
 				case 'Array':
-					var id = _.util.objId(o);
+					id = _.util.objId(o);
 					if (visited[id]) {
 						return visited[id];
 					}
-					var clone = [];
+					clone = [];
 					visited[id] = clone;
 
 					o.forEach(function (v, i) {
 						clone[i] = deepClone(v, visited);
 					});
 
 					return clone;
-			}
 
-			return o;
+				default:
+					return o;
+			}
 		}
 	},
 

diff --git a/components/prism-core.min.js b/components/prism-core.min.js
diff --git a/prism.js b/prism.js
@@ -50,16 +50,16 @@ var _ = _self.Prism = {
 
 		// Deep clone a language definition (e.g. to extend it)
 		clone: function deepClone(o, visited) {
-			var type = _.util.type(o);
+			var clone, id, type = _.util.type(o);
 			visited = visited || {};
 
 			switch (type) {
 				case 'Object':
-					var id = _.util.objId(o);
+					id = _.util.objId(o);
 					if (visited[id]) {
 						return visited[id];
 					}
-					var clone = {};
+					clone = {};
 					visited[id] = clone;
 
 					for (var key in o) {
@@ -71,21 +71,22 @@ var _ = _self.Prism = {
 					return clone;
 
 				case 'Array':
-					var id = _.util.objId(o);
+					id = _.util.objId(o);
 					if (visited[id]) {
 						return visited[id];
 					}
-					var clone = [];
+					clone = [];
 					visited[id] = clone;
 
 					o.forEach(function (v, i) {
 						clone[i] = deepClone(v, visited);
 					});
 
 					return clone;
-			}
 
-			return o;
+				default:
+					return o;
+			}
 		}
 	},