commit 8d8e707917a06369603b4428c2db8c6fa88590d9
parent e8199857bf7bf3a5a6a002a996fbd65db5a8cc0f
Author: Serban Stanca <sstanca@mozilla.com>
Date: Thu, 8 Jan 2026 23:05:48 +0200
Revert "Bug 1933442 - Recognize MX apartment numbers and differentiate them correctly from house numbers. r=dimi" as requested by dmeehan for causing Bug 2009025.
This reverts commit 2cb4fb98f62f8cc0e143c4df63a6fdcee9555d8f.
Diffstat:
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/toolkit/components/formautofill/shared/AddressParser.sys.mjs b/toolkit/components/formautofill/shared/AddressParser.sys.mjs
@@ -99,10 +99,7 @@ class StreetNameRegExp extends StreetAddressPartRegExp {
// A regular expression to match the apartment number portion of a street address,
class ApartmentNumberRegExp extends StreetAddressPartRegExp {
- static keyword =
- "apt|apartment|wohnung|apto|-" +
- "|unit|suite|ste|#|room" + // From chromium source // Firefox specific
- "|dpto|int"; // es-MX
+ static keyword = "apt|apartment|wohnung|apto|-" + "|unit|suite|ste|#|room"; // From chromium source // Firefox specific
static PREFIX = `(${ApartmentNumberRegExp.keyword})(\\.|\\s|-)*`;
static PATTERN = "\\w*([-|\\/]\\w*)?";
diff --git a/toolkit/components/formautofill/shared/HeuristicsRegExp.sys.mjs b/toolkit/components/formautofill/shared/HeuristicsRegExp.sys.mjs
@@ -57,18 +57,16 @@ export const HeuristicsRegExp = {
"|(?<neg>nome.*)|endereço", // es
"address-line2":
"addrline2|address_2|addl2" +
- "|landmark" + // common in IN
- "|complement|interior|interno|int|dpto", // es-MX
- "address-line3": "addrline3|address_3|addl3" +
- "|complement|interior|interno|int|dpto", // es-MX
- "address-level2":
+ "|landmark", // common in IN
+ "address-line3": "addrline3|address_3|addl3",
+ "address-level2":
"città" + // it-IT
"|miasto|miejscowosc|miejscowość" + //pl-PL
"|\\bstad|woonplaats|plaats" + // nl
"|ciudad", // es-MX
"address-housenumber":
"(house|building|street1?)[\\s\\-_]*number|hausnummer|haus|house[a-z\-]*n(r|o)" +
- "|n[úu]mero(?!\\s*int)|exterior" +
+ "|n[úu]mero" +
"|domu" + // pl-PL
"|huisnummer", // nl
"address-level3":