Removes getIn (#5810)

Author: Łukasz Sobek

src/reducers/ast.js

@@ -153,7 +153,7 @@ export function getSymbols(state: OuterState, source: Source): ?Symbols {
     return null;
   }
 
-  return state.ast.getIn(["symbols", source.id]) || null;
+  return state.ast.symbols.get(source.id) || null;
 }
 
 export function hasSymbols(state: OuterState, source: Source): boolean {
@@ -189,11 +189,11 @@ export function getEmptyLines(state: OuterState, source: Source) {
     return null;
   }
 
-  return state.ast.getIn(["emptyLines", source.id]);
+  return state.ast.emptyLines.get(source.id);
 }
 
 export function getPausePoints(state: OuterState, sourceId: string) {
-  return state.ast.getIn(["pausePoints", sourceId]);
+  return state.ast.pausePoints.get(sourceId);
 }
 
 export function hasPausePoints(state: OuterState, sourceId: string): boolean {
@@ -211,7 +211,7 @@ export function getPreview(state: OuterState) {
 
 const emptySourceMetaData = {};
 export function getSourceMetaData(state: OuterState, sourceId: string) {
-  return state.ast.getIn(["sourceMetaData", sourceId]) || emptySourceMetaData;
+  return state.ast.sourceMetaData.get(sourceId) || emptySourceMetaData;
 }
 
 export function hasSourceMetaData(state: OuterState, sourceId: string) {

src/reducers/expressions.js

@@ -40,20 +40,20 @@ function update(
       if (action.expressionError) {
         return state.set("expressionError", !!action.expressionError);
       }
-      return appendToList(state, ["expressions"], {
+      return appendExpressionToList(state, {
         input: action.input,
         value: null,
         updating: true
       });
     case "UPDATE_EXPRESSION":
       const key = action.expression.input;
-      return updateItemInList(state, ["expressions"], key, {
+      return updateExpressionInList(state, key, {
         input: action.input,
         value: null,
         updating: true
       }).set("expressionError", !!action.expressionError);
     case "EVALUATE_EXPRESSION":
-      return updateItemInList(state, ["expressions"], action.input, {
+      return updateExpressionInList(state, action.input, {
         input: action.input,
         value: action.value,
         updating: false
@@ -79,7 +79,7 @@ function travelTo(state, action) {
   }
   return expressions.reduce(
     (finalState, previousState) =>
-      updateItemInList(finalState, ["expressions"], previousState.input, {
+      updateExpressionInList(finalState, previousState.input, {
         input: previousState.input,
         value: previousState.value,
         updating: false
@@ -96,38 +96,32 @@ function restoreExpressions() {
   return exprs;
 }
 
-function storeExpressions(state) {
-  const expressions = state
-    .getIn(["expressions"])
+function storeExpressions({ expressions }) {
+  prefs.expressions = expressions
     .map(expression => omit(expression, "value"))
     .toJS();
-
-  prefs.expressions = expressions;
 }
 
-function appendToList(
-  state: Record<ExpressionState>,
-  path: string[],
-  value: any
-) {
-  const newState = state.updateIn(path, () => {
-    return state.getIn(path).push(value);
+function appendExpressionToList(state: Record<ExpressionState>, value: any) {
+  const newState = state.update("expressions", () => {
+    return state.expressions.push(value);
   });
+
   storeExpressions(newState);
   return newState;
 }
 
-function updateItemInList(
+function updateExpressionInList(
   state: Record<ExpressionState>,
-  path: string[],
   key: string,
   value: any
 ) {
-  const newState = state.updateIn(path, () => {
-    const list = state.getIn(path);
+  const newState = state.update("expressions", () => {
+    const list = state.expressions;
     const index = list.findIndex(e => e.input == key);
     return list.update(index, () => value);
   });
+
   storeExpressions(newState);
   return newState;
 }
@@ -147,7 +141,7 @@ const getExpressionsWrapper = state => state.expressions;
 
 export const getExpressions = createSelector(
   getExpressionsWrapper,
-  expressions => expressions.get("expressions")
+  expressions => expressions.expressions
 );
 
 export function getExpression(state: OuterState, input: string) {
@@ -156,7 +150,7 @@ export function getExpression(state: OuterState, input: string) {
 
 export const getExpressionError = createSelector(
   getExpressionsWrapper,
-  expressions => expressions.get("expressionError")
+  expressions => expressions.expressionError
 );
 
 export default update;

src/reducers/file-search.js

@@ -70,7 +70,7 @@ function update(
     }
 
     case "TOGGLE_FILE_SEARCH_MODIFIER": {
-      const actionVal = !state.getIn(["modifiers", action.modifier]);
+      const actionVal = !state.modifiers[action.modifier];
 
       if (action.modifier == "caseSensitive") {
         prefs.fileSearchCaseSensitive = actionVal;
@@ -98,15 +98,15 @@ function update(
 type OuterState = { fileSearch: Record<FileSearchState> };
 
 export function getFileSearchQuery(state: OuterState): string {
-  return state.fileSearch.get("query");
+  return state.fileSearch.query;
 }
 
 export function getFileSearchModifiers(state: OuterState): Modifiers {
-  return state.fileSearch.get("modifiers");
+  return state.fileSearch.modifiers;
 }
 
 export function getFileSearchResults(state: OuterState) {
-  return state.fileSearch.get("searchResults");
+  return state.fileSearch.searchResults;
 }
 
 export default update;

src/reducers/pending-breakpoints.js

@@ -139,7 +139,7 @@ function removeBreakpoint(state, action) {
   const { breakpoint } = action;
 
   const locationId = makePendingLocationId(breakpoint.location);
-  const pendingBp = state.getIn(["pendingBreakpoints", locationId]);
+  const pendingBp = state.pendingBreakpoints.get(locationId);
 
   if (!pendingBp && action.status == "start") {
     return state.set("pendingBreakpoints", I.Map());

src/reducers/sources.js

@@ -192,7 +192,7 @@ function updateSource(state: Record<SourcesState>, source: Source | Object) {
     return state;
   }
 
-  const existingSource = state.getIn(["sources", source.id]);
+  const existingSource = state.sources.get(source.id);
 
   if (existingSource) {
     const updatedSource = existingSource.merge(source);