Bug 1371298 - support sticky_prefs in devtools addon prefs loader;r=bgrins
authorJulian Descottes <jdescottes@mozilla.com>
Thu, 08 Jun 2017 18:19:51 +0200
changeset 411164 b418659052d26c36c9e4f0f569d5277a5643086f
parent 411163 5b3aef6c71b7a5acf9c5f9caa209c14140abad2e
child 411165 a494916f461a29dac8099841efa3eb6024d99796
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbgrins
bugs1371298
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1371298 - support sticky_prefs in devtools addon prefs loader;r=bgrins MozReview-Commit-ID: BgPvk9ykdrX
devtools/bootstrap.js
--- a/devtools/bootstrap.js
+++ b/devtools/bootstrap.js
@@ -72,17 +72,17 @@ function interpretPreprocessingInstructi
       }
       ignoring = !ifMap[line];
     } else if (line.startsWith("#else")) {
       ignoring = !ignoring;
     } else if (line.startsWith("#endif")) {
       ignoring = false;
     }
 
-    let isPrefLine = /^ *pref\("([^"]+)"/.test(line);
+    let isPrefLine = /^ *(sticky_)?pref\("([^"]+)"/.test(line);
     if (continuation || (!ignoring && isPrefLine)) {
       newLines.push(line);
 
       // The call to pref(...); might span more than one line.
       continuation = !/\);/.test(line);
     }
   }
   return newLines.join("\n");