Skip to content

Commit e40c454

Browse files
Add retrieval for pattern order by prefixes to ensure previous behavior (#1281)
* Change pattern ordering * Revert "Change pattern ordering" This reverts commit 36523f8. * Add retrieval for pattern order prefixes
1 parent 9e67c56 commit e40c454

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

packages/core/src/lib/object_factory.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,19 @@ const Pattern = function(
173173
this.patternGroupData.order = info.patternSubgroupOrder;
174174
}
175175

176+
// TODO: Remove the following when ordering by file prefix gets obsolete
177+
if (prefixMatcherDeprecationCheckOrder.test(this.fileName)) {
178+
if (this.fileName.indexOf('~') === -1) {
179+
this.order = this.setPatternOrderDataForInfo(this.fileName);
180+
} else {
181+
this.variantOrder = this.setPatternOrderDataForInfo(this.fileName);
182+
}
183+
}
184+
176185
/**
177186
* Determines if this pattern needs to be recompiled.
178187
*
179-
* @ee {@link CompileState}*/
188+
* @see {@link CompileState}*/
180189
this.compileState = null;
181190

182191
/**
@@ -371,12 +380,14 @@ Pattern.prototype = {
371380
.split(/\/|\\/, 2)
372381
.map((o, i) => {
373382
if (i === 0) {
383+
// TODO: Remove when prefix gets deprecated
374384
info.patternGroupOrder = Pattern.prototype.setPatternOrderDataForInfo(
375385
o
376386
);
377387
}
378388

379389
if (i === 1) {
390+
// TODO: Remove when prefix gets deprecated
380391
info.patternSubgroupOrder = Pattern.prototype.setPatternOrderDataForInfo(
381392
o
382393
);

0 commit comments

Comments
 (0)