Revert "Merge branch 'develop' into rc/0.2.0"

This reverts commit b1b163e, reversing
changes made to 06c1d05.

.github/workflows/main.yml

@@ -0,0 +1,29 @@
+name: Node.js CI
+
+on:
+ push:
+ branches: [ develop ]
+ pull_request:
+ branches: [ develop ]
+
+jobs:
+ build:
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [ubuntu-latest, windows-latest]
+ node-version: [10.x, 12.x, 14.x, 15.x]
+
+ runs-on: ${{ matrix.os }}
+
+ steps:
+ - uses: actions/checkout@v3
+ - name: Use Node.js ${{ matrix.node-version }}
+ uses: actions/setup-node@v3
+ with:
+ node-version: ${{ matrix.node-version }}
+ - run: npm install
+ - run: npm run pretest
+ - uses: GabrielBB/xvfb-action@v1.0
+ with:
+ run: npm test

.gitignore

@@ -3,5 +3,7 @@ dist
 node_modules
 .vscode-test/
 *.vsix
+yarn*
 package-lock.json
+
 old/

package.json

@@ -102,7 +102,7 @@
  ]
  },
  "activationEvents": [
- "onLanguage:anime-list" 
+ "onLanguage:anime-list"
  ],
  "scripts": {
  "vscode:prepublish": "yarn run compile",

src/cache/anime/show-storage.ts

@@ -61,10 +61,6 @@ export default class ShowStorage extends Registry<Show> {
  return Array.from(this.showDict.keys());
  }
 
- public iterShows() {
- return this.showDict.values();
- }
-
  public listFriends() {
  return [...this.friendList];
  }

src/cache/anime/shows.ts

@@ -34,7 +34,7 @@ export class Show {
 
  this.info = {
  title,
- lastMentionedLine: lastMentionedLine ?? declarationLine,
+ lastMentionedLine: lastMentionedLine ?? -1,
  watchEntries: watchEntries ?? [],
  firstMentionedLine: declarationLine,
  tags: tags ?? [],

src/extension.ts

@@ -19,7 +19,6 @@ import { formatFriend } from './commands/format-friend';
 import ShowDefinitionProvider from './lang/anime-definition-provider';
 import { TagRegistry } from './core/registry/tag-registry';
 import { registerDefaultTags } from './core/tag';
-import ShowSymbolProvider from './lang/anime-symbol-provider';
 
 type ExtensionActivationState = { activated: true, context: ExtensionContext } | { activated: false };
 
@@ -100,7 +99,6 @@ export class MarucsAnime {
  AnimeCompletionItemProvider.register(context),
  ShowLensProvider.register(context),
  ShowDefinitionProvider.register(context),
- ShowSymbolProvider.register(context),
  );
  }
 }

src/lang/anime-completion-provider.ts

@@ -3,7 +3,6 @@ import * as vscode from "vscode";
 import ShowStorage from "../cache/anime/show-storage";
 import { LANGUAGE_ID } from "../constants";
 import { MarucsAnime } from "../extension";
-import { Show } from "../cache/anime/shows";
 
 enum CompletionType {
  ShowTitle = 'ShowTitle',
@@ -67,10 +66,9 @@ export default class ShowCompletionItemProvider implements CompletionItemProvide
  }
 
  private getCompletionOptionsFromStorage(storage: ShowStorage, completionType: CompletionType): string[] {
- const byLastMentionedLine = (show1: Show, show2: Show) => show2.info.lastMentionedLine - show1.info.lastMentionedLine;
  switch (completionType) {
  case CompletionType.Friend: return storage.listFriends();
- case CompletionType.ShowTitle: return [...storage.iterShows()].sort(byLastMentionedLine).map(show => show.info.title);
+ case CompletionType.ShowTitle: return storage.listShows();
  case CompletionType.Tag: return MarucsAnime.INSTANCE.tagRegistry.listKeys();
  default:
  console.error('Not Implemented completion: ', completionType.toString());
@@ -131,24 +129,17 @@ export default class ShowCompletionItemProvider implements CompletionItemProvide
  [CompletionType.NoCompletion]: undefined,
  };
 
- const createCompletionItem = (option: string, index: number): CompletionItem => {
+ const createCompletionItem = (option: string): CompletionItem => {
  const commitCharacters = commitCharactersPerType[completionType];
  const textToInsert = option + postfixesPerType[completionType];
-
- const zeros = Math.ceil(Math.log10(options.length+1));
- const indexAlphaOrdered =`${(index+1)}`.padStart(zeros, '0');
- const sortIndex = `${indexAlphaOrdered}/${options.length}`;
-
- const item = <CompletionItem>{
- // label: `${sortIndex} - ${option}`,
- label: `${option}`,
+ const item = {
+ label: option,
  kind: getCompletionKind(),
  insertText: textToInsert,
  keepWhitespace: true,
  range: new Range(position.translate(0, -alreadyTypedText.length), position),
  commitCharacters: commitCharacters,
- command: commandPerType[completionType],
- sortText: sortIndex,
+ command: commandPerType[completionType]
  };
  return item;
  };