Merge pull request #468 from microsoft/main

Create a new pull request by comparing changes across two branches
angular-indonesia · Aug 28, 2023 · cd3aff4 · cd3aff4
2 parents 04f9e70 + 27a5bdd
commit cd3aff4
Show file tree

Hide file tree

Showing 75 changed files with 2,066 additions and 215 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/scripts/errorCheck.mjs b/scripts/errorCheck.mjs
@@ -71,7 +71,7 @@ async function checkSourceFiles() {
     let count = 0;
     console.log("== List of errors not used in source ==");
     for (const errName of errorNames) {
-        if (allSrc.indexOf(errName) < 0) {
+        if (!allSrc.includes(errName)) {
             console.log(errName);
             count++;
         }

diff --git a/scripts/eslint/rules/argument-trivia.cjs b/scripts/eslint/rules/argument-trivia.cjs
@@ -157,7 +157,7 @@ module.exports = createRule({
                 }
             }
 
-            const hasNewLine = sourceCodeText.slice(commentRangeEnd, argRangeStart).indexOf("\n") >= 0;
+            const hasNewLine = sourceCodeText.slice(commentRangeEnd, argRangeStart).includes("\n");
             if (argRangeStart !== commentRangeEnd + 1 && !hasNewLine) {
                 // TODO(jakebailey): range should be whitespace
                 context.report({

diff --git a/scripts/update-experimental-branches.mjs b/scripts/update-experimental-branches.mjs
@@ -88,7 +88,7 @@ async function main() {
         const mergeTree = runSequence([
             ["git", ["merge-tree", mergeBase.trim(), branch, "experimental"]],
         ]);
-        if (mergeTree.indexOf(`===${"="}===`) >= 0) { // 7 equals is the center of the merge conflict marker
+        if (mergeTree.includes(`===${"="}===`)) { // 7 equals is the center of the merge conflict marker
             throw new Error(`Merge conflict detected involving PR ${branch} with other experiment`);
         }
         // Merge (always producing a merge commit)

diff --git a/src/cancellationToken/cancellationToken.ts b/src/cancellationToken/cancellationToken.ts
@@ -39,7 +39,7 @@ function createCancellationToken(args: string[]): ServerCancellationToken {
     // in this case pipe name will be build dynamically as <cancellationPipeName><request_seq>.
     if (cancellationPipeName.charAt(cancellationPipeName.length - 1) === "*") {
         const namePrefix = cancellationPipeName.slice(0, -1);
-        if (namePrefix.length === 0 || namePrefix.indexOf("*") >= 0) {
+        if (namePrefix.length === 0 || namePrefix.includes("*")) {
             throw new Error("Invalid name for template cancellation pipe: it should have length greater than 2 characters and contain only one '*'.");
         }
         let perRequestPipeName: string | undefined;