chore: cleanup legacy code (#888)

dream-num · Dec 26, 2023 · 76bb1d6 · 76bb1d6
1 parent 54cdd7d
commit 76bb1d6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/packages/core/src/services/command/command.service.ts b/packages/core/src/services/command/command.service.ts
@@ -267,7 +267,7 @@ export class CommandService implements ICommandService {
  return result;
  }
 
- throw new Error(`[CommandService]: Command "${id}" is not registered.`);
+ throw new Error(`[CommandService]: command "${id}" is not registered.`);
  }
 
  syncExecuteCommand<P extends object = object, R = boolean>(
@@ -308,7 +308,7 @@ export class CommandService implements ICommandService {
  return result;
  }
 
- throw new Error(`[CommandService]: Command "${id}" is not registered.`);
+ throw new Error(`[CommandService]: command "${id}" is not registered.`);
  }
 
  private _pushCommandExecutionStack(stackItem: ICommandExecutionStackItem): IDisposable {

diff --git a/packages/sheets-ui/src/controllers/sheet-ui.controller.ts b/packages/sheets-ui/src/controllers/sheet-ui.controller.ts
@@ -20,7 +20,6 @@ import {
  SetFontFamilyCommand,
  SetFontSizeCommand,
  SetItalicCommand,
- SetSelectionsOperation,
  SetStrikeThroughCommand,
  SetUnderlineCommand,
 } from '@univerjs/sheets';
@@ -277,7 +276,6 @@ export class SheetUIController extends Disposable {
  SetRowFrozenCommand,
  SetColumnFrozenCommand,
  CancelFrozenCommand,
- SetSelectionsOperation,
  SetUnderlineCommand,
  SetZoomRatioCommand,
  SetZoomRatioOperation,

diff --git a/packages/sheets/src/commands/operations/selection.operation.ts b/packages/sheets/src/commands/operations/selection.operation.ts
@@ -28,25 +28,18 @@ export interface ISetSelectionsOperationParams {
  selections: ISelectionWithStyle[];
  type?: SelectionMoveType;
 }
+
 export const SetSelectionsOperation: IOperation<ISetSelectionsOperationParams> = {
  id: 'sheet.operation.set-selections',
  type: CommandType.OPERATION,
  handler: (accessor, params) => {
  const selectionManagerService = accessor.get(SelectionManagerService);
-
  if (!params) {
  return false;
  }
 
  const { selections, type } = params;
-
- // TODO@yuhongz: incorrect coupling
- // if (params.pluginName === FORMAT_PAINTER_SELECTION_PLUGIN_NAME) {
- // selections.length > 1 && selections.splice(1, selections.length - 2);
- // }
-
  selectionManagerService.replace(selections, type);
-
  return true;
  },
 };
diff --git a/packages/sheets/src/controllers/basic-worksheet.controller.ts b/packages/sheets/src/controllers/basic-worksheet.controller.ts
@@ -108,6 +108,7 @@ import {
  SetWorksheetRowHeightMutation,
  SetWorksheetRowIsAutoHeightMutation,
 } from '../commands/mutations/set-worksheet-row-height.mutation';
+import { SetSelectionsOperation } from '../commands/operations/selection.operation';
 import { SetWorksheetActiveOperation } from '../commands/operations/set-worksheet-active.operation';
 import { MAX_CELL_PER_SHEET_DEFAULT, MAX_CELL_PER_SHEET_KEY } from './config/config';
 
@@ -213,6 +214,7 @@ export class BasicWorksheetController extends Disposable implements IDisposable
  SetWorksheetRowIsAutoHeightMutation,
  SetWorksheetShowCommand,
  SetNumfmtMutation,
+ SetSelectionsOperation,
  RemoveNumfmtMutation,
  ].forEach((command) => this.disposeWithMe(this._commandService.registerCommand(command)));