tor-browser

commit 405436996272546c93bd78764a4ec90082b06c62
parent 421856fd8c0a9b8b1f52c213b44e1739cdd43adb
Author: Nicolas Chevobbe <nchevobbe@mozilla.com>
Date:   Fri, 21 Nov 2025 14:59:51 +0000

Bug 2000876 - [devtools] Turn modifySelector into an async function. r=devtools-reviewers,ochameau.

Differential Revision: https://phabricator.services.mozilla.com/D272415

Diffstat:
M
devtools/server/actors/style-rule.js
 | 
66
++++++++++++++++++++++++++++--------------------------------------

1 file changed, 28 insertions(+), 38 deletions(-)
diff --git a/devtools/server/actors/style-rule.js b/devtools/server/actors/style-rule.js
@@ -1349,61 +1349,51 @@ class StyleRuleActor extends Actor {
    *        True if the selector should be updated by editing the
    *        authored text; false if the selector should be updated via
    *        CSSOM.
-   * @returns {Object}
+   * @returns {Promise<Object>}
    *        Returns an object that contains the applied style properties of the
    *        new rule and a boolean indicating whether or not the new selector
    *        matches the current selected element
    */
-  modifySelector(node, value, editAuthored = false) {
+  async modifySelector(node, value, editAuthored = false) {
     if (this.type === ELEMENT_STYLE || this.rawRule.selectorText === value) {
       return { ruleProps: null, isMatching: true };
     }
 
     // The rule's previous selector is lost after calling _addNewSelector(). Save it now.
     const oldValue = this.rawRule.selectorText;
-    let selectorPromise = this._addNewSelector(value, editAuthored);
+    const newCssRule = await this._addNewSelector(value, editAuthored);
 
-    if (editAuthored) {
-      selectorPromise = selectorPromise.then(newCssRule => {
-        if (newCssRule) {
-          this.logSelectorChange(oldValue, value);
-          const style = this.pageStyle._styleRef(newCssRule);
-          // See the comment in |form| to understand this.
-          return style.getAuthoredCssText().then(() => newCssRule);
-        }
-        return newCssRule;
-      });
+    if (editAuthored && newCssRule) {
+      this.logSelectorChange(oldValue, value);
+      const style = this.pageStyle._styleRef(newCssRule);
+      // See the comment in |form| to understand this.
+      await style.getAuthoredCssText();
     }
 
-    return selectorPromise.then(newCssRule => {
-      let entries = null;
-      let isMatching = false;
+    let entries = null;
+    let isMatching = false;
 
-      if (newCssRule) {
-        const ruleEntry = this.pageStyle.findEntryMatchingRule(
-          node,
-          newCssRule
-        );
-        if (ruleEntry.length === 1) {
-          entries = this.pageStyle.getAppliedProps(node, ruleEntry, {
-            matchedSelectors: true,
-          });
-        } else {
-          entries = this.pageStyle.getNewAppliedProps(node, newCssRule);
-        }
-
-        isMatching = entries.some(
-          ruleProp => !!ruleProp.matchedSelectorIndexes.length
-        );
+    if (newCssRule) {
+      const ruleEntry = this.pageStyle.findEntryMatchingRule(node, newCssRule);
+      if (ruleEntry.length === 1) {
+        entries = this.pageStyle.getAppliedProps(node, ruleEntry, {
+          matchedSelectors: true,
+        });
+      } else {
+        entries = this.pageStyle.getNewAppliedProps(node, newCssRule);
       }
 
-      const result = { isMatching };
-      if (entries) {
-        result.ruleProps = { entries };
-      }
+      isMatching = entries.some(
+        ruleProp => !!ruleProp.matchedSelectorIndexes.length
+      );
+    }
 
-      return result;
-    });
+    const result = { isMatching };
+    if (entries) {
+      result.ruleProps = { entries };
+    }
+
+    return result;
   }
 
   /**