CPP-4519 Rollback the serialization name for function call (OC.FUNCTI…

…ON_CALL -> OC.FUNCTION)
PerryZhao · Sep 28, 2017 · 87a1022 · 87a1022
1 parent f502283
commit 87a1022
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 64 deletions.
diff --git a/colorSchemes/src/colorSchemes/all_hallows_eve.xml b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
@@ -960,8 +960,8 @@
  </option>
  <option baseAttributes="TEXT" name="OC.DOT" />
  <option baseAttributes="OC.LOCAL_VARIABLE" name="OC.EXTERN_VARIABLE" />
- <option baseAttributes="TEXT" name="OC.FUNCTION_CALL" />
- <option baseAttributes="MESSAGE_ARGUMENT" name="OC.FUNCTION_CALL" />
+ <option baseAttributes="DEFAULT_FUNCTION_CALL" name="OC.FUNCTION" />
+ <option baseAttributes="DEFAULT_FUNCTION_DECLARATION" name="OC.FUNCTION_DECLARATION" />
  <option baseAttributes="OC.LOCAL_VARIABLE" name="OC.GLOBAL_VARIABLE" />
  <option name="OC.KEYWORD">
  <value>

diff --git a/colorSchemes/src/colorSchemes/blackboard.xml b/colorSchemes/src/colorSchemes/blackboard.xml
@@ -944,16 +944,8 @@
  </option>
  <option baseAttributes="TEXT" name="OC.DOT" />
  <option baseAttributes="OC.LOCAL_VARIABLE" name="OC.EXTERN_VARIABLE" />
- <option name="OC.FUNCTION_CALL">
- <value>
- <option name="FOREGROUND" value="FF6400" />
- </value>
- </option>
- <option name="OC.FUNCTION_DECLARATION">
- <value>
- <option name="FOREGROUND" value="FF6400" />
- </value>
- </option>
+ <option baseAttributes="DEFAULT_FUNCTION_CALL" name="OC.FUNCTION" />
+ <option baseAttributes="DEFAULT_FUNCTION_DECLARATION" name="OC.FUNCTION_DECLARATION" />
  <option baseAttributes="OC.LOCAL_VARIABLE" name="OC.GLOBAL_VARIABLE" />
  <option name="OC.KEYWORD">
  <value>

diff --git a/colorSchemes/src/colorSchemes/cobalt.xml b/colorSchemes/src/colorSchemes/cobalt.xml
@@ -1172,16 +1172,8 @@
  <option name="FOREGROUND" value="CCCCCC" />
  </value>
  </option>
- <option name="OC.FUNCTION_CALL">
- <value>
- <option name="FOREGROUND" value="FFDD00" />
- </value>
- </option>
- <option name="OC.FUNCTION_DECLARATION">
- <value>
- <option name="FOREGROUND" value="FFDD00" />
- </value>
- </option>
+ <option baseAttributes="DEFAULT_FUNCTION_CALL" name="OC.FUNCTION" />
+ <option baseAttributes="DEFAULT_FUNCTION_DECLARATION" name="OC.FUNCTION_DECLARATION" />
  <option name="OC.GLOBAL_VARIABLE">
  <value>
  <option name="FOREGROUND" value="CCCCCC" />

diff --git a/colorSchemes/src/colorSchemes/github.xml b/colorSchemes/src/colorSchemes/github.xml
@@ -1066,18 +1066,8 @@
  <option name="FOREGROUND" value="108888" />
  </value>
  </option>
- <option name="OC.FUNCTION_CALL">
- <value>
- <option name="FOREGROUND" value="990000" />
- <option name="FONT_TYPE" value="1" />
- </value>
- </option>
- <option name="OC.FUNCTION_DECLARATION">
- <value>
- <option name="FOREGROUND" value="990000" />
- <option name="FONT_TYPE" value="1" />
- </value>
- </option>
+ <option baseAttributes="DEFAULT_FUNCTION_CALL" name="OC.FUNCTION" />
+ <option baseAttributes="DEFAULT_FUNCTION_DECLARATION" name="OC.FUNCTION_DECLARATION" />
  <option name="OC.GLOBAL_VARIABLE">
  <value>
  <option name="FOREGROUND" value="108888" />

diff --git a/colorSchemes/src/colorSchemes/monokai.xml b/colorSchemes/src/colorSchemes/monokai.xml
@@ -948,16 +948,8 @@
  </option>
  <option baseAttributes="TEXT" name="OC.DOT" />
  <option baseAttributes="OC.LOCAL_VARIABLE" name="OC.EXTERN_VARIABLE" />
- <option name="OC.FUNCTION_CALL">
- <value>
- <option name="FOREGROUND" value="A6E22E" />
- </value>
- </option>
- <option name="OC.FUNCTION_DECLARATION">
- <value>
- <option name="FOREGROUND" value="A6E22E" />
- </value>
- </option>
+ <option baseAttributes="DEFAULT_FUNCTION_CALL" name="OC.FUNCTION" />
+ <option baseAttributes="DEFAULT_FUNCTION_DECLARATION" name="OC.FUNCTION_DECLARATION" />
  <option baseAttributes="OC.LOCAL_VARIABLE" name="OC.GLOBAL_VARIABLE" />
  <option name="OC.KEYWORD">
  <value>

diff --git a/colorSchemes/src/colorSchemes/rails_casts.xml b/colorSchemes/src/colorSchemes/rails_casts.xml
@@ -1028,16 +1028,8 @@
  <option name="FOREGROUND" value="D0D0FF" />
  </value>
  </option>
- <option name="OC.FUNCTION_CALL">
- <value>
- <option name="FOREGROUND" value="FFC66D" />
- </value>
- </option>
- <option name="OC.FUNCTION_DECLARATION">
- <value>
- <option name="FOREGROUND" value="FFC66D" />
- </value>
- </option>
+ <option baseAttributes="DEFAULT_FUNCTION_CALL" name="OC.FUNCTION" />
+ <option baseAttributes="DEFAULT_FUNCTION_DECLARATION" name="OC.FUNCTION_DECLARATION" />
  <option name="OC.GLOBAL_VARIABLE">
  <value>
  <option name="FOREGROUND" value="D0D0FF" />

diff --git a/colorSchemes/src/colorSchemes/twilight.xml b/colorSchemes/src/colorSchemes/twilight.xml
@@ -1039,16 +1039,8 @@
  <option name="FOREGROUND" value="7587A6" />
  </value>
  </option>
- <option name="OC.FUNCTION_CALL">
- <value>
- <option name="FOREGROUND" value="9B703F" />
- </value>
- </option>
- <option name="OC.FUNCTION_DECLARATION">
- <value>
- <option name="FOREGROUND" value="9B703F" />
- </value>
- </option>
+ <option baseAttributes="DEFAULT_FUNCTION_CALL" name="OC.FUNCTION" />
+ <option baseAttributes="DEFAULT_FUNCTION_DECLARATION" name="OC.FUNCTION_DECLARATION" />
  <option name="OC.GLOBAL_VARIABLE">
  <value>
  <option name="FOREGROUND" value="7587A6" />