Replace deprecated String#substr with String#slice (#8314)

CommanderRoot · web-flow · commit c35fc169f532 · 2022-04-14T07:52:42.000Z
diff --git a/src/Avatar.ts b/src/Avatar.ts
@@ -57,7 +57,7 @@ function isValidHexColor(color: string): boolean {
     return typeof color === "string" &&
         (color.length === 7 || color.length === 9) &&
         color.charAt(0) === "#" &&
-        !color.substr(1).split("").some(c => isNaN(parseInt(c, 16)));
+        !color.slice(1).split("").some(c => isNaN(parseInt(c, 16)));
 }
 
 function urlForColor(color: string): string {
diff --git a/src/autocomplete/CommandProvider.tsx b/src/autocomplete/CommandProvider.tsx
@@ -55,7 +55,7 @@ export default class CommandProvider extends AutocompleteProvider {
         // check if the full match differs from the first word (i.e. returns false if the command has args)
         if (command[0] !== command[1]) {
             // The input looks like a command with arguments, perform exact match
-            const name = command[1].substr(1); // strip leading `/`
+            const name = command[1].slice(1); // strip leading `/`
             if (CommandMap.has(name) && CommandMap.get(name).isEnabled()) {
                 // some commands, namely `me` don't suit having the usage shown whilst typing their arguments
                 if (CommandMap.get(name).hideCompletionAfterSpace) return [];
diff --git a/src/components/views/dialogs/CreateRoomDialog.tsx b/src/components/views/dialogs/CreateRoomDialog.tsx
@@ -103,7 +103,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
             createOpts.preset = Preset.PublicChat;
             opts.guestAccess = false;
             const { alias } = this.state;
-            createOpts.room_alias_name = alias.substr(1, alias.indexOf(":") - 1);
+            createOpts.room_alias_name = alias.substring(1, alias.indexOf(":"));
         } else {
             // If we cannot change encryption we pass `true` for safety, the server should automatically do this for us.
             opts.encryption = this.state.canChangeEncryption ? this.state.isEncrypted : true;
diff --git a/src/components/views/elements/EffectsOverlay.tsx b/src/components/views/elements/EffectsOverlay.tsx
@@ -55,7 +55,7 @@ const EffectsOverlay: FunctionComponent<IProps> = ({ roomWidth }) => {
         const onAction = (payload: { action: string }) => {
             const actionPrefix = 'effects.';
             if (payload.action.indexOf(actionPrefix) === 0) {
-                const effect = payload.action.substr(actionPrefix.length);
+                const effect = payload.action.slice(actionPrefix.length);
                 lazyLoadEffectModule(effect).then((module) => module?.start(canvasRef.current));
             }
         };
diff --git a/src/components/views/rooms/BasicMessageComposer.tsx b/src/components/views/rooms/BasicMessageComposer.tsx
@@ -364,7 +364,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
     private insertText(textToInsert: string, inputType = "insertText"): void {
         const sel = document.getSelection();
         const { caret, text } = getCaretOffsetAndText(this.editorRef.current, sel);
-        const newText = text.substr(0, caret.offset) + textToInsert + text.substr(caret.offset);
+        const newText = text.slice(0, caret.offset) + textToInsert + text.slice(caret.offset);
         caret.offset += textToInsert.length;
         this.modifiedFlag = true;
         this.props.model.update(newText, inputType, caret);
diff --git a/src/components/views/rooms/MemberList.tsx b/src/components/views/rooms/MemberList.tsx
@@ -274,7 +274,7 @@ export default class MemberList extends React.Component<IProps, IState> {
 
             this.sortNames.set(
                 member,
-                (member.name[0] === '@' ? member.name.substr(1) : member.name).replace(SORT_REGEX, ""),
+                (member.name[0] === '@' ? member.name.slice(1) : member.name).replace(SORT_REGEX, ""),
             );
 
             // XXX: this user may have no lastPresenceTs value!
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -56,7 +56,7 @@ export const createSpace = async (
                 events_default: 100,
                 invite: isPublic ? 0 : 50,
             },
-            room_alias_name: isPublic && alias ? alias.substr(1, alias.indexOf(":") - 1) : undefined,
+            room_alias_name: isPublic && alias ? alias.substring(1, alias.indexOf(":")) : undefined,
             topic,
             ...createOpts,
         },
diff --git a/src/editor/deserialize.ts b/src/editor/deserialize.ts
@@ -97,7 +97,7 @@ function parseCodeBlock(n: Node, pc: PartCreator): Part[] {
     if (n.firstChild?.nodeName === "CODE") {
         for (const className of (n.firstChild as HTMLElement).classList) {
             if (className.startsWith("language-") && !className.startsWith("language-_")) {
-                language = className.substr("language-".length);
+                language = className.slice("language-".length);
                 break;
             }
         }
@@ -118,7 +118,7 @@ function parseCodeBlock(n: Node, pc: PartCreator): Part[] {
 }
 
 function parseHeader(n: Node, pc: PartCreator): Part[] {
-    const depth = parseInt(n.nodeName.substr(1), 10);
+    const depth = parseInt(n.nodeName.slice(1), 10);
     const prefix = pc.plain("#".repeat(depth) + " ");
     return [prefix, ...parseChildren(n, pc)];
 }
diff --git a/src/editor/diff.ts b/src/editor/diff.ts
@@ -33,16 +33,16 @@ function firstDiff(a: string, b: string): number {
 
 function diffStringsAtEnd(oldStr: string, newStr: string): IDiff {
     const len = Math.min(oldStr.length, newStr.length);
-    const startInCommon = oldStr.substr(0, len) === newStr.substr(0, len);
+    const startInCommon = oldStr.slice(0, len) === newStr.slice(0, len);
     if (startInCommon && oldStr.length > newStr.length) {
-        return { removed: oldStr.substr(len), at: len };
+        return { removed: oldStr.slice(len), at: len };
     } else if (startInCommon && oldStr.length < newStr.length) {
-        return { added: newStr.substr(len), at: len };
+        return { added: newStr.slice(len), at: len };
     } else {
         const commonStartLen = firstDiff(oldStr, newStr);
         return {
-            removed: oldStr.substr(commonStartLen),
-            added: newStr.substr(commonStartLen),
+            removed: oldStr.slice(commonStartLen),
+            added: newStr.slice(commonStartLen),
             at: commonStartLen,
         };
     }
@@ -55,7 +55,7 @@ export function diffDeletion(oldStr: string, newStr: string): IDiff {
     }
     const firstDiffIdx = firstDiff(oldStr, newStr);
     const amount = oldStr.length - newStr.length;
-    return { at: firstDiffIdx, removed: oldStr.substr(firstDiffIdx, amount) };
+    return { at: firstDiffIdx, removed: oldStr.slice(firstDiffIdx, firstDiffIdx + amount) };
 }
 
 /**
@@ -70,7 +70,7 @@ export function diffDeletion(oldStr: string, newStr: string): IDiff {
 export function diffAtCaret(oldValue: string, newValue: string, caretPosition: number): IDiff {
     const diffLen = newValue.length - oldValue.length;
     const caretPositionBeforeInput = caretPosition - diffLen;
-    const oldValueBeforeCaret = oldValue.substr(0, caretPositionBeforeInput);
-    const newValueBeforeCaret = newValue.substr(0, caretPosition);
+    const oldValueBeforeCaret = oldValue.substring(0, caretPositionBeforeInput);
+    const newValueBeforeCaret = newValue.substring(0, caretPosition);
     return diffStringsAtEnd(oldValueBeforeCaret, newValueBeforeCaret);
 }
diff --git a/src/editor/operations.ts b/src/editor/operations.ts
@@ -281,7 +281,7 @@ export function toggleInlineFormat(range: Range, prefix: string, suffix = prefix
         if (isFormatted) {
             // remove prefix and suffix formatting string
             const partWithoutPrefix = parts[base].serialize();
-            partWithoutPrefix.text = partWithoutPrefix.text.substr(prefix.length);
+            partWithoutPrefix.text = partWithoutPrefix.text.slice(prefix.length);
             parts[base] = partCreator.deserializePart(partWithoutPrefix);
 
             const partWithoutSuffix = parts[index - 1].serialize();
diff --git a/src/editor/parts.ts b/src/editor/parts.ts
@@ -106,16 +106,16 @@ abstract class BasePart {
     }
 
     public split(offset: number): IBasePart {
-        const splitText = this.text.substr(offset);
-        this._text = this.text.substr(0, offset);
+        const splitText = this.text.slice(offset);
+        this._text = this.text.slice(0, offset);
         return new PlainPart(splitText);
     }
 
     // removes len chars, or returns the plain text this part should be replaced with
     // if the part would become invalid if it removed everything.
     public remove(offset: number, len: number): string | undefined {
         // validate
-        const strWithRemoval = this.text.substr(0, offset) + this.text.substr(offset + len);
+        const strWithRemoval = this.text.slice(0, offset) + this.text.slice(offset + len);
         for (let i = offset; i < (len + offset); ++i) {
             const chr = this.text.charAt(i);
             if (!this.acceptsRemoval(i, chr)) {
@@ -131,8 +131,8 @@ abstract class BasePart {
         for (let i = 0; i < str.length; ++i) {
             const chr = str.charAt(i);
             if (!this.acceptsInsertion(chr, offset + i, inputType)) {
-                this._text = this._text + str.substr(0, i);
-                return str.substr(i);
+                this._text = this._text + str.slice(0, i);
+                return str.slice(i);
             }
         }
         this._text = this._text + str;
@@ -147,17 +147,17 @@ abstract class BasePart {
                 return false;
             }
         }
-        const beforeInsert = this._text.substr(0, offset);
-        const afterInsert = this._text.substr(offset);
+        const beforeInsert = this._text.slice(0, offset);
+        const afterInsert = this._text.slice(offset);
         this._text = beforeInsert + str + afterInsert;
         return true;
     }
 
     public createAutoComplete(updateCallback: UpdateCallback): void {}
 
     protected trim(len: number): string {
-        const remaining = this._text.substr(len);
-        this._text = this._text.substr(0, len);
+        const remaining = this._text.slice(len);
+        this._text = this._text.slice(0, len);
         return remaining;
     }
 
diff --git a/src/languageHandler.tsx b/src/languageHandler.tsx
@@ -290,7 +290,7 @@ export function replaceByRegexes(text: string, mapping: IVariables | Tags): stri
             matchFoundSomewhere = true;
 
             // The textual part before the first match
-            const head = inputText.substr(0, match.index);
+            const head = inputText.slice(0, match.index);
 
             const parts = [];
             // keep track of prevMatch
@@ -326,9 +326,9 @@ export function replaceByRegexes(text: string, mapping: IVariables | Tags): stri
                 let tail;
                 if (match) {
                     const startIndex = prevMatch.index + prevMatch[0].length;
-                    tail = inputText.substr(startIndex, match.index - startIndex);
+                    tail = inputText.slice(startIndex, match.index);
                 } else {
-                    tail = inputText.substr(prevMatch.index + prevMatch[0].length);
+                    tail = inputText.slice(prevMatch.index + prevMatch[0].length);
                 }
                 if (tail) {
                     parts.push(tail);
@@ -500,7 +500,7 @@ export function pickBestLanguage(langs: string[]): string {
 
     {
         // Failing that, a different dialect of the same language
-        const closeLangIndex = normalisedLangs.findIndex((l) => l.substr(0, 2) === currentLang.substr(0, 2));
+        const closeLangIndex = normalisedLangs.findIndex((l) => l.slice(0, 2) === currentLang.slice(0, 2));
         if (closeLangIndex > -1) return langs[closeLangIndex];
     }
 
diff --git a/src/stores/widgets/StopGapWidget.ts b/src/stores/widgets/StopGapWidget.ts
@@ -115,7 +115,7 @@ export class ElementWidget extends Widget {
 
         let theme = new ThemeWatcher().getEffectiveTheme();
         if (theme.startsWith("custom-")) {
-            const customTheme = getCustomTheme(theme.substr(7));
+            const customTheme = getCustomTheme(theme.slice(7));
             // Jitsi only understands light/dark
             theme = customTheme.is_dark ? "dark" : "light";
         }
diff --git a/src/theme.ts b/src/theme.ts
@@ -230,7 +230,7 @@ export async function setTheme(theme?: string): Promise<void> {
     clearCustomTheme();
     let stylesheetName = theme;
     if (theme.startsWith("custom-")) {
-        const customTheme = getCustomTheme(theme.substr(7));
+        const customTheme = getCustomTheme(theme.slice(7));
         stylesheetName = customTheme.is_dark ? "dark-custom" : "light-custom";
         setCustomThemeVars(customTheme);
     }
diff --git a/test/PosthogAnalytics-test.ts b/test/PosthogAnalytics-test.ts
@@ -59,7 +59,7 @@ describe("PosthogAnalytics", () => {
                     const hexHash = shaHashes[message];
                     const bytes = [];
                     for (let c = 0; c < hexHash.length; c += 2) {
-                        bytes.push(parseInt(hexHash.substr(c, 2), 16));
+                        bytes.push(parseInt(hexHash.slice(c, c + 2), 16));
                     }
                     return bytes as unknown as ArrayBuffer;
                 },
diff --git a/test/components/views/rooms/MemberList-test.tsx b/test/components/views/rooms/MemberList-test.tsx
@@ -199,8 +199,8 @@ describe('MemberList', () => {
             }
 
             if (!groupChange) {
-                const nameA = memberA.name[0] === '@' ? memberA.name.substr(1) : memberA.name;
-                const nameB = memberB.name[0] === '@' ? memberB.name.substr(1) : memberB.name;
+                const nameA = memberA.name[0] === '@' ? memberA.name.slice(1) : memberA.name;
+                const nameB = memberB.name[0] === '@' ? memberB.name.slice(1) : memberB.name;
                 const nameCompare = compare(nameB, nameA);
                 console.log("Comparing name");
                 expect(nameCompare).toBeGreaterThanOrEqual(0);
diff --git a/test/end-to-end-tests/src/rest/session.ts b/test/end-to-end-tests/src/rest/session.ts
@@ -42,7 +42,7 @@ export class RestSession {
     }
 
     userName(): string {
-        return this.credentials.userId.split(":")[0].substr(1);
+        return this.credentials.userId.split(":")[0].slice(1);
     }
 
     displayName(): string {

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ function isValidHexColor(color: string): boolean {`
`57`	`57`	`return typeof color === "string" &&`
`58`	`58`	`(color.length === 7 \|\| color.length === 9) &&`
`59`	`59`	`color.charAt(0) === "#" &&`
`60`		`- !color.substr(1).split("").some(c => isNaN(parseInt(c, 16)));`
	`60`	`+ !color.slice(1).split("").some(c => isNaN(parseInt(c, 16)));`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`function urlForColor(color: string): string {`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ const EffectsOverlay: FunctionComponent<IProps> = ({ roomWidth }) => {`
`55`	`55`	`const onAction = (payload: { action: string }) => {`
`56`	`56`	`const actionPrefix = 'effects.';`
`57`	`57`	`if (payload.action.indexOf(actionPrefix) === 0) {`
`58`		`- const effect = payload.action.substr(actionPrefix.length);`
	`58`	`+ const effect = payload.action.slice(actionPrefix.length);`
`59`	`59`	`lazyLoadEffectModule(effect).then((module) => module?.start(canvasRef.current));`
`60`	`60`	`}`
`61`	`61`	`};`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ function parseCodeBlock(n: Node, pc: PartCreator): Part[] {`
`97`	`97`	`if (n.firstChild?.nodeName === "CODE") {`
`98`	`98`	`for (const className of (n.firstChild as HTMLElement).classList) {`
`99`	`99`	`if (className.startsWith("language-") && !className.startsWith("language-_")) {`
`100`		`- language = className.substr("language-".length);`
	`100`	`+ language = className.slice("language-".length);`
`101`	`101`	`break;`
`102`	`102`	`}`
`103`	`103`	`}`
`@@ -118,7 +118,7 @@ function parseCodeBlock(n: Node, pc: PartCreator): Part[] {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`function parseHeader(n: Node, pc: PartCreator): Part[] {`
`121`		`- const depth = parseInt(n.nodeName.substr(1), 10);`
	`121`	`+ const depth = parseInt(n.nodeName.slice(1), 10);`
`122`	`122`	`const prefix = pc.plain("#".repeat(depth) + " ");`
`123`	`123`	`return [prefix, ...parseChildren(n, pc)];`
`124`	`124`	`}`