Rewrite position reducer in RTK

Author: shepmaster

ui/frontend/.eslintrc.js

@@ -88,6 +88,7 @@ module.exports = {
         'reducers/output/miri.ts',
         'reducers/output/wasm.ts',
         'reducers/page.ts',
+        'reducers/position.ts',
         'reducers/versions.ts',
         'reducers/websocket.ts',
         'websocketActions.ts',

ui/frontend/.prettierignore

@@ -39,6 +39,7 @@ node_modules
 !reducers/output/miri.ts
 !reducers/output/wasm.ts
 !reducers/page.ts
+!reducers/position.ts
 !reducers/versions.ts
 !reducers/websocket.ts
 !websocketActions.ts

ui/frontend/actions.ts

@@ -22,7 +22,6 @@ import {
   PrimaryActionCore,
   ProcessAssembly,
   Position,
-  makePosition,
 } from './types';
 
 import { performCommonExecute, wsExecuteRequest } from './reducers/output/execute';
@@ -62,7 +61,6 @@ export enum ActionType {
   AddImport = 'ADD_IMPORT',
   AddCrateType = 'ADD_CRATE_TYPE',
   EnableFeatureGate = 'ENABLE_FEATURE_GATE',
-  GotoPosition = 'GOTO_POSITION',
   SelectText = 'SELECT_TEXT',
   NotificationSeen = 'NOTIFICATION_SEEN',
   BrowserWidthChanged = 'BROWSER_WIDTH_CHANGED',
@@ -213,9 +211,6 @@ export const addCrateType = (crateType: string) =>
 export const enableFeatureGate = (featureGate: string) =>
   createAction(ActionType.EnableFeatureGate, { featureGate });
 
-export const gotoPosition = (line: string | number, column: string | number) =>
-  createAction(ActionType.GotoPosition, makePosition(line, column));
-
 export const selectText = (start: Position, end: Position) =>
   createAction(ActionType.SelectText, { start, end });
 
@@ -333,7 +328,6 @@ export type Action =
   | ReturnType<typeof addImport>
   | ReturnType<typeof addCrateType>
   | ReturnType<typeof enableFeatureGate>
-  | ReturnType<typeof gotoPosition>
   | ReturnType<typeof selectText>
   | ReturnType<typeof notificationSeen>
   | ReturnType<typeof browserWidthChanged>

ui/frontend/highlighting.ts

@@ -4,7 +4,7 @@ import { Channel, makePosition, Position } from './types';
 interface ConfigureRustErrorsArgs {
   enableFeatureGate: (feature: string) => void;
   getChannel: () => Channel;
-  gotoPosition: (line: string | number, column: string | number) => void;
+  gotoPosition: (p: Position) => void;
   selectText: (start: Position, end: Position) => void;
   addImport: (code: string) => void;
   reExecuteWithBacktrace: () => void;
@@ -154,7 +154,7 @@ export function configureRustErrors({
         link.onclick = e => {
           e.preventDefault();
           if (line && col) {
-            gotoPosition(line, col);
+            gotoPosition(makePosition(line, col));
           }
         };
       }
@@ -178,7 +178,7 @@ export function configureRustErrors({
           e.preventDefault();
           if (link.dataset.featureGate) {
             enableFeatureGate(link.dataset.featureGate);
-            gotoPosition(1, 1);
+            gotoPosition(makePosition(1, 1));
           }
         };
       }

ui/frontend/index.tsx

@@ -11,7 +11,6 @@ import { v4 } from 'uuid';
 import {
   editCode,
   enableFeatureGate,
-  gotoPosition,
   selectText,
   addImport,
   reExecuteWithBacktrace,
@@ -27,6 +26,7 @@ import Router from './Router';
 import configureStore from './configureStore';
 import { performVersionsLoad } from './reducers/versions';
 import { performCratesLoad } from './reducers/crates';
+import { gotoPosition } from './reducers/position';
 
 const store = configureStore(window);
 
@@ -61,7 +61,7 @@ maxWidthMediaQuery.addEventListener('change', whenBrowserWidthChanged);
 
 configureRustErrors({
   enableFeatureGate: featureGate => store.dispatch(enableFeatureGate(featureGate)),
-  gotoPosition: (line, col) => store.dispatch(gotoPosition(line, col)),
+  gotoPosition: (p) => store.dispatch(gotoPosition(p)),
   selectText: (start, end) => store.dispatch(selectText(start, end)),
   addImport: (code) => store.dispatch(addImport(code)),
   reExecuteWithBacktrace: () => store.dispatch(reExecuteWithBacktrace()),

ui/frontend/reducers/position.ts

@@ -1,20 +1,22 @@
-import { Action, ActionType } from '../actions';
+import { PayloadAction, createSlice } from '@reduxjs/toolkit';
+
 import { Position } from '../types';
 
-const DEFAULT: Position = {
+const initialState: Position = {
   line: 0,
   column: 0,
 };
 
-export type State = Position;
+const slice = createSlice({
+  name: 'position',
+  initialState,
+  reducers: {
+    gotoPosition: (_state, action: PayloadAction<Position>) => {
+      return action.payload;
+    },
+  },
+});
+
+export const { gotoPosition } = slice.actions;
 
-export default function position(state = DEFAULT, action: Action) {
-  switch (action.type) {
-    case ActionType.GotoPosition: {
-      const { line, column } = action;
-      return { ...state, line, column };
-    }
-    default:
-      return state;
-  }
-}
+export default slice.reducer;