🚚 Rename RimeCLI to Rime

tonyfettes · Apr 18, 2024 · d3b25fb · d3b25fb
1 parent c2d384b
commit d3b25fb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -2,16 +2,16 @@ import { commands, ExtensionContext, listManager, CompletionContext, window, wor
 import { Position, CancellationToken, CompletionList, Range } from 'vscode-languageserver-protocol';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import SchemaList from './lists';
-import { RimeCLI } from './rime';
+import { Rime } from './rime';
 import { Config } from './config';
 
 export async function activate(context: ExtensionContext): Promise<void> {
   const userConfig = new Config(context);
 
-  const rimeCLI: RimeCLI = new RimeCLI(await userConfig.traits);
-  rimeCLI.setCompletionStatus(userConfig.enabled);
-  rimeCLI.getSchema().then((schemaId) => {
-    if (schemaId !== userConfig.schemaId && userConfig.schemaId !== '') rimeCLI.setSchema(userConfig.schemaId);
+  const rime: Rime = new Rime(await userConfig.traits);
+  rime.setCompletionStatus(userConfig.enabled);
+  rime.getSchema().then((schemaId) => {
+    if (schemaId !== userConfig.schemaId && userConfig.schemaId !== '') rime.setSchema(userConfig.schemaId);
   });
   const statusBarItem = window.createStatusBarItem(0, { progress: false });
   statusBarItem.text = userConfig.shortcut;
@@ -22,18 +22,18 @@ export async function activate(context: ExtensionContext): Promise<void> {
   context.subscriptions.push(
     // Commands
     commands.registerCommand('rime.enable', async () => {
-      rimeCLI.setCompletionStatus(true);
+      rime.setCompletionStatus(true);
       statusBarItem.show();
     }),
 
     commands.registerCommand('rime.disable', async () => {
-      rimeCLI.setCompletionStatus(false);
+      rime.setCompletionStatus(false);
       statusBarItem.hide();
     }),
 
     commands.registerCommand('rime.toggle', async () => {
-      rimeCLI.toggleCompletionStatus();
-      if (rimeCLI.getCompletionStatus()) {
+      rime.toggleCompletionStatus();
+      if (rime.getCompletionStatus()) {
         statusBarItem.show();
       } else {
         statusBarItem.hide();
@@ -82,7 +82,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
               ['-', ['——']],
             ]);
             let offset = document.offsetAt(position);
-            if (offset != 0 && rimeCLI.getCompletionStatus()) {
+            if (offset != 0 && rime.getCompletionStatus()) {
               let inputString = '';
               let inputRange: Range = { start: position, end: position };
               const getPrevSingleChar = (offset: number): string => {
@@ -117,7 +117,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
                   inputString = '';
                 }
                 inputRange.start = document.positionAt(offset);
-                rimeCLI
+                rime
                   .getContext(inputString)
                   .then((res) => {
                     if (
@@ -161,5 +161,5 @@ export async function activate(context: ExtensionContext): Promise<void> {
   );
 
   // Schema List
-  listManager.registerList(new SchemaList(workspace.nvim, rimeCLI));
+  listManager.registerList(new SchemaList(workspace.nvim, rime));
 }
diff --git a/src/lists.ts b/src/lists.ts
@@ -1,5 +1,5 @@
 import { BasicList, ListAction, ListContext, ListItem, Neovim, window } from 'coc.nvim';
-import { RimeSchema, RimeCLI } from './rime';
+import { RimeSchema, Rime } from './rime';
 
 export default class SchemaList extends BasicList {
   public readonly name = 'rime_schema';
@@ -8,20 +8,20 @@ export default class SchemaList extends BasicList {
   public schemaList: RimeSchema[] = [];
   public actions: ListAction[] = [];
 
-  private rimeCLI: RimeCLI;
+  private rime: Rime;
 
-  constructor(nvim: Neovim, rimeCLI: RimeCLI) {
+  constructor(nvim: Neovim, rime: Rime) {
     super(nvim);
-    this.rimeCLI = rimeCLI;
+    this.rime = rime;
     this.addAction('open', (item: ListItem) => {
-      this.rimeCLI
+      this.rime
         .setSchema(item.data.schema_id)
         .then((_) => {})
         .catch((e) => {
           console.log(`Error setting the schema: ${e}`);
           window.showMessage(`Set schema ${item.data.label} failed.`);
         });
-      this.rimeCLI
+      this.rime
         .getSchema()
         .then((schema_id) => {
           window.showMessage(`Changed to schema ${schema_id}.`);
@@ -35,7 +35,7 @@ export default class SchemaList extends BasicList {
 
   public async loadItems(_context: ListContext): Promise<ListItem[] | null> {
     return new Promise<ListItem[] | null>((resolve, _) => {
-      this.rimeCLI.getSchemaList().then((res) => {
+      this.rime.getSchemaList().then((res) => {
         let listItems: ListItem[] = res.map((schema) => {
           return {
             label: schema.name + ': ' + schema.schema_id,

diff --git a/src/rime.ts b/src/rime.ts
@@ -3,7 +3,7 @@ import { exec } from 'child_process';
 import { Traits } from './config';
 import { default as binding, RimeContext, RimeSchema } from './binding';
 
-export class RimeCLI {
+export class Rime {
   private isEnabled: boolean = true;
   private readonly traits: Traits;
   private sessionId: BigInt;