fix: Colors for variable, function and constant should be different (#4802)

andrewnester · web-flow · commit 9e81bdafc3d5 · 2022-05-31T10:37:59.000+02:00
diff --git a/lib/ace/theme/chrome.css b/lib/ace/theme/chrome.css
@@ -80,9 +80,7 @@
   color: rgb(0, 0, 205);
 }
 
-.ace-chrome .ace_variable,
-.ace-chrome .ace_variable:not(.ace_parameter),
-.ace-chrome .ace_constant:not(.ace_numeric) {
+.ace-chrome .ace_variable {
   color: rgb(49, 132, 149);
 }
 
diff --git a/lib/ace/theme/merbivore.css b/lib/ace/theme/merbivore.css
@@ -63,9 +63,7 @@
 .ace-merbivore .ace_constant.ace_character,
 .ace-merbivore .ace_constant.ace_character.ace_escape,
 .ace-merbivore .ace_constant.ace_other,
-.ace-merbivore .ace_support.ace_type,
-.ace-merbivore .ace_variable:not(.ace_parameter),
-.ace-merbivore .ace_constant:not(.ace_numeric) {
+.ace-merbivore .ace_support.ace_type {
   color: #1EDAFB
 }
 
diff --git a/lib/ace/theme/merbivore_soft.css b/lib/ace/theme/merbivore_soft.css
@@ -62,9 +62,7 @@
 .ace-merbivore-soft .ace_constant.ace_character,
 .ace-merbivore-soft .ace_constant.ace_character.ace_escape,
 .ace-merbivore-soft .ace_constant.ace_other,
-.ace-merbivore-soft .ace_support.ace_type,
-.ace-merbivore-soft .ace_variable:not(.ace_parameter),
-.ace-merbivore-soft .ace_constant:not(.ace_numeric) {
+.ace-merbivore-soft .ace_support.ace_type {
   color: #68C1D8
 }
 
diff --git a/lib/ace/theme/tomorrow.css b/lib/ace/theme/tomorrow.css
@@ -92,9 +92,7 @@
 
 .ace-tomorrow .ace_entity.ace_name.ace_function,
 .ace-tomorrow .ace_support.ace_function,
-.ace-tomorrow .ace_variable,
-.ace-tomorrow .ace_variable:not(.ace_parameter),
-.ace-tomorrow .ace_constant:not(.ace_numeric) {
+.ace-tomorrow .ace_variable {
   color: #4271AE
 }
 
diff --git a/lib/ace/theme/tomorrow_night.css b/lib/ace/theme/tomorrow_night.css
@@ -92,9 +92,7 @@
 
 .ace-tomorrow-night .ace_entity.ace_name.ace_function,
 .ace-tomorrow-night .ace_support.ace_function,
-.ace-tomorrow-night .ace_variable,
-.ace-tomorrow-night .ace_variable:not(.ace_parameter),
-.ace-tomorrow-night .ace_constant:not(.ace_numeric) {
+.ace-tomorrow-night .ace_variable {
   color: #81A2BE
 }
 
diff --git a/lib/ace/theme/tomorrow_night_blue.css b/lib/ace/theme/tomorrow_night_blue.css
@@ -89,9 +89,7 @@
 
 .ace-tomorrow-night-blue .ace_entity.ace_name.ace_function,
 .ace-tomorrow-night-blue .ace_support.ace_function,
-.ace-tomorrow-night-blue .ace_variable,
-.ace-tomorrow-night-blue .ace_variable:not(.ace_parameter),
-.ace-tomorrow-night-blue .ace_constant:not(.ace_numeric) {
+.ace-tomorrow-night-blue .ace_variable {
   color: #BBDAFF
 }
 
diff --git a/lib/ace/theme/tomorrow_night_bright.css b/lib/ace/theme/tomorrow_night_bright.css
@@ -104,9 +104,7 @@
 
 .ace-tomorrow-night-bright .ace_entity.ace_name.ace_function,
 .ace-tomorrow-night-bright .ace_support.ace_function,
-.ace-tomorrow-night-bright .ace_variable,
-.ace-tomorrow-night-bright .ace_variable:not(.ace_parameter),
-.ace-tomorrow-night-bright .ace_constant:not(.ace_numeric) {
+.ace-tomorrow-night-bright .ace_variable {
   color: #7AA6DA
 }
 
diff --git a/lib/ace/theme/tomorrow_night_eighties.css b/lib/ace/theme/tomorrow_night_eighties.css
@@ -93,9 +93,7 @@
 
 .ace-tomorrow-night-eighties .ace_entity.ace_name.ace_function,
 .ace-tomorrow-night-eighties .ace_support.ace_function,
-.ace-tomorrow-night-eighties .ace_variable,
-.ace-tomorrow-night-eighties .ace_variable:not(.ace_parameter),
-.ace-tomorrow-night-eighties .ace_constant:not(.ace_numeric) {
+.ace-tomorrow-night-eighties .ace_variable {
   color: #6699CC
 }
 
diff --git a/lib/ace/theme/xcode.css b/lib/ace/theme/xcode.css
@@ -70,9 +70,7 @@
 
 .ace-xcode .ace_entity.ace_other.ace_attribute-name,
 .ace-xcode .ace_support.ace_constant,
-.ace-xcode .ace_support.ace_function, 
-.ace-xcode .ace_variable:not(.ace_parameter),
-.ace-xcode .ace_constant:not(.ace_numeric) {
+.ace-xcode .ace_support.ace_function {
   color: #450084
 }
 

Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,7 @@`
`80`	`80`	`color: rgb(0, 0, 205);`
`81`	`81`	`}`
`82`	`82`
`83`		`-.ace-chrome .ace_variable,`
`84`		`-.ace-chrome .ace_variable:not(.ace_parameter),`
`85`		`-.ace-chrome .ace_constant:not(.ace_numeric) {`
	`83`	`+.ace-chrome .ace_variable {`
`86`	`84`	`color: rgb(49, 132, 149);`
`87`	`85`	`}`
`88`	`86`
Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,7 @@`
`92`	`92`
`93`	`93`	`.ace-tomorrow .ace_entity.ace_name.ace_function,`
`94`	`94`	`.ace-tomorrow .ace_support.ace_function,`
`95`		`-.ace-tomorrow .ace_variable,`
`96`		`-.ace-tomorrow .ace_variable:not(.ace_parameter),`
`97`		`-.ace-tomorrow .ace_constant:not(.ace_numeric) {`
	`95`	`+.ace-tomorrow .ace_variable {`
`98`	`96`	`color: #4271AE`
`99`	`97`	`}`
`100`	`98`
Original file line number	Diff line number	Diff line change
`@@ -89,9 +89,7 @@`
`89`	`89`
`90`	`90`	`.ace-tomorrow-night-blue .ace_entity.ace_name.ace_function,`
`91`	`91`	`.ace-tomorrow-night-blue .ace_support.ace_function,`
`92`		`-.ace-tomorrow-night-blue .ace_variable,`
`93`		`-.ace-tomorrow-night-blue .ace_variable:not(.ace_parameter),`
`94`		`-.ace-tomorrow-night-blue .ace_constant:not(.ace_numeric) {`
	`92`	`+.ace-tomorrow-night-blue .ace_variable {`
`95`	`93`	`color: #BBDAFF`
`96`	`94`	`}`
`97`	`95`
Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,7 @@`
`104`	`104`
`105`	`105`	`.ace-tomorrow-night-bright .ace_entity.ace_name.ace_function,`
`106`	`106`	`.ace-tomorrow-night-bright .ace_support.ace_function,`
`107`		`-.ace-tomorrow-night-bright .ace_variable,`
`108`		`-.ace-tomorrow-night-bright .ace_variable:not(.ace_parameter),`
`109`		`-.ace-tomorrow-night-bright .ace_constant:not(.ace_numeric) {`
	`107`	`+.ace-tomorrow-night-bright .ace_variable {`
`110`	`108`	`color: #7AA6DA`
`111`	`109`	`}`
`112`	`110`
Original file line number	Diff line number	Diff line change
`@@ -93,9 +93,7 @@`
`93`	`93`
`94`	`94`	`.ace-tomorrow-night-eighties .ace_entity.ace_name.ace_function,`
`95`	`95`	`.ace-tomorrow-night-eighties .ace_support.ace_function,`
`96`		`-.ace-tomorrow-night-eighties .ace_variable,`
`97`		`-.ace-tomorrow-night-eighties .ace_variable:not(.ace_parameter),`
`98`		`-.ace-tomorrow-night-eighties .ace_constant:not(.ace_numeric) {`
	`96`	`+.ace-tomorrow-night-eighties .ace_variable {`
`99`	`97`	`color: #6699CC`
`100`	`98`	`}`
`101`	`99`
Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,7 @@`
`70`	`70`
`71`	`71`	`.ace-xcode .ace_entity.ace_other.ace_attribute-name,`
`72`	`72`	`.ace-xcode .ace_support.ace_constant,`
`73`		`-.ace-xcode .ace_support.ace_function,`
`74`		`-.ace-xcode .ace_variable:not(.ace_parameter),`
`75`		`-.ace-xcode .ace_constant:not(.ace_numeric) {`
	`73`	`+.ace-xcode .ace_support.ace_function {`
`76`	`74`	`color: #450084`
`77`	`75`	`}`
`78`	`76`