More reverted

Author: AndreasArvidsson

packages/app-vscode/src/ScopeTreeProvider.ts

@@ -182,7 +182,7 @@ export class ScopeTreeProvider implements TreeDataProvider<MyTreeItem> {
       };
     })();
 
-    return this.supportLevels
+    const supportLevels = this.supportLevels
       .filter(
         (supportLevel) =>
           supportLevel.support === scopeSupport &&
@@ -201,26 +201,11 @@ export class ScopeTreeProvider implements TreeDataProvider<MyTreeItem> {
             isEqual(supportLevel.scopeType, this.scopeVisualizer.scopeType),
             getContainmentIcon?.(supportLevel.scopeType),
           ),
-      )
-      .toSorted((a, b) => {
-        if (
-          a.scopeTypeInfo.spokenForm.type !== b.scopeTypeInfo.spokenForm.type
-        ) {
-          // Scopes with no spoken form are sorted to the bottom
-          return a.scopeTypeInfo.spokenForm.type === "error" ? 1 : -1;
-        }
+      );
 
-        if (
-          a.scopeTypeInfo.isLanguageSpecific !==
-          b.scopeTypeInfo.isLanguageSpecific
-        ) {
-          // Then language-specific scopes are sorted to the top
-          return a.scopeTypeInfo.isLanguageSpecific ? -1 : 1;
-        }
+    supportLevels.sort(compareScopeTypes);
 
-        // Then alphabetical by label
-        return a.label.label.localeCompare(b.label.label);
-      });
+    return supportLevels;
   }
 
   private getContainmentIcon(
@@ -255,6 +240,26 @@ export class ScopeTreeProvider implements TreeDataProvider<MyTreeItem> {
   }
 }
 
+function compareScopeTypes(
+  a: ScopeSupportTreeItem,
+  b: ScopeSupportTreeItem,
+): number {
+  if (a.scopeTypeInfo.spokenForm.type !== b.scopeTypeInfo.spokenForm.type) {
+    // Scopes with no spoken form are sorted to the bottom
+    return a.scopeTypeInfo.spokenForm.type === "error" ? 1 : -1;
+  }
+
+  if (
+    a.scopeTypeInfo.isLanguageSpecific !== b.scopeTypeInfo.isLanguageSpecific
+  ) {
+    // Then language-specific scopes are sorted to the top
+    return a.scopeTypeInfo.isLanguageSpecific ? -1 : 1;
+  }
+
+  // Then alphabetical by label
+  return a.label.label.localeCompare(b.label.label);
+}
+
 function getSupportCategories(): SupportCategoryTreeItem[] {
   return [
     new SupportCategoryTreeItem(ScopeSupport.supportedAndPresentInEditor),

packages/lib-common/src/ide/inMemoryTextEditor/performEdits.ts

@@ -42,7 +42,8 @@ function createChangeEvents(
    */
   const sortedEdits = edits
     .map((edit, index) => ({ edit, index }))
-    .toSorted((a, b) => {
+    // oxlint-disable-next-line unicorn/no-array-sort
+    .sort((a, b) => {
       // Edits starting at the same position are sorted in reverse given order.
       if (a.edit.range.start.isEqual(b.edit.range.start)) {
         return b.index - a.index;

packages/lib-engine/src/processTargets/modifiers/scopeHandlers/SentenceScopeHandler/SentenceScopeHandler.ts

@@ -42,6 +42,7 @@ export class SentenceScopeHandler extends NestedScopeHandler {
 
     return direction === "forward"
       ? imap(sentences, sentenceToScope)
-      : Array.from(sentences, sentenceToScope).toReversed();
+      : // oxlint-disable-next-line unicorn/no-array-sort
+        Array.from(sentences, sentenceToScope).sort();
   }
 }

packages/lib-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/getDelimiterOccurrences.ts

@@ -92,5 +92,6 @@ function getSortedCaptures(items?: QueryCapture[]): QueryCapture[] {
   if (items == null) {
     return [];
   }
-  return items.toSorted((a, b) => a.range.start.compareTo(b.range.start));
+  items.sort((a, b) => a.range.start.compareTo(b.range.start));
+  return items;
 }

packages/lib-engine/src/scopeProviders/ScopeSupportWatcher.ts

@@ -110,7 +110,6 @@ export class ScopeSupportWatcher {
 
     const scopeTypeInfos = this.scopeInfoProvider.getScopeTypeInfos();
 
-    // oxlint-disable-next-line oxc/no-map-spread
     return scopeTypeInfos.map((scopeTypeInfo) => ({
       ...scopeTypeInfo,
       support: getScopeTypeSupport(scopeTypeInfo.scopeType),

packages/lib-engine/src/util/allocateHats/getRankedTokens.ts

@@ -35,7 +35,6 @@ export function getRankedTokens(
     const referencePosition = editor.selections[0].active;
     const displayLineMap = getDisplayLineMap(editor, [referencePosition.line]);
     const tokens = editor.visibleRanges.flatMap((range) =>
-      // oxlint-disable-next-line oxc/no-map-spread
       getTokensInRange(ide, editor, range).map((partialToken) => ({
         ...partialToken,
         displayLine: displayLineMap.get(partialToken.range.start.line)!,

packages/lib-engine/src/util/getMatchesInRange.ts

@@ -43,5 +43,6 @@ export function generateMatchesInRange(
 
   return direction === "forward"
     ? imap(text.matchAll(regex), matchToRange)
-    : Array.from(text.matchAll(regex), matchToRange).toReversed();
+    : // oxlint-disable-next-line unicorn/no-array-sort
+      Array.from(text.matchAll(regex), matchToRange).sort();
 }

packages/lib-engine/src/util/unifyRanges.ts

@@ -7,7 +7,6 @@ export function unifyRemovalTargets(targets: Target[]): Target[] {
   if (targets.length < 2) {
     return targets;
   }
-  // oxlint-disable-next-line oxc/no-map-spread
   return groupTargetsForEachEditor(targets).flatMap(
     ([_editor, editorTargets]) => {
       if (editorTargets.length < 2) {