From 3922df31060f11e76a063e3efc48ee2fca5d5de3 Mon Sep 17 00:00:00 2001
From: Beth Brennan <elbrenn@github.com>
Date: Mon, 9 Jan 2023 10:38:47 -0500
Subject: [PATCH] PR feedback: object type, test

---
 .../src/context-providers/github.ts           |  9 +++---
 .../src/validate.expressions.test.ts          | 29 ++++++++++---------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/actions-languageservice/src/context-providers/github.ts b/actions-languageservice/src/context-providers/github.ts
index 5c44cb5..9695a50 100644
--- a/actions-languageservice/src/context-providers/github.ts
+++ b/actions-languageservice/src/context-providers/github.ts
@@ -75,8 +75,8 @@ function getEventContext(workflowContext: WorkflowContext): ExpressionData {
   }
 
   const events = Object.keys(eventsConfig);
-  for (let e of events) {
-    let payload = eventPayloads[e];
+  for (const e of events) {
+    const payload = eventPayloads[e];
     if (payload) {
       merge(d, payload);
     }
@@ -85,9 +85,8 @@ function getEventContext(workflowContext: WorkflowContext): ExpressionData {
   return d;
 }
 
-function merge(d: data.Dictionary, toAdd: any): data.Dictionary {
-  for (let key of Object.keys(toAdd)) {
-    const value = toAdd[key];
+function merge(d: data.Dictionary, toAdd: Object): data.Dictionary {
+  for (const [key, value] of Object.entries(toAdd)) {
     if (value && typeof value === "object" && !d.get(key)) {
       d.add(key, merge(new data.Dictionary(), value));
     } else {
diff --git a/actions-languageservice/src/validate.expressions.test.ts b/actions-languageservice/src/validate.expressions.test.ts
index b0ed5cf..0233569 100644
--- a/actions-languageservice/src/validate.expressions.test.ts
+++ b/actions-languageservice/src/validate.expressions.test.ts
@@ -207,19 +207,19 @@ jobs:
 
       expect(result).toEqual([
         {
-          "message": "Context access might be invalid: foo",
-          "range": {
-            "end": {
-              "character": 41,
-              "line": 5,
-            },
-            "start": {
-              "character": 25,
-              "line": 5,
+          message: "Context access might be invalid: foo",
+          range: {
+            end: {
+              character: 41,
+              line: 5
             },
+            start: {
+              character: 25,
+              line: 5
+            }
           },
-          "severity": 2,
-        },
+          severity: 2
+        }
       ]);
     });
 
@@ -1133,13 +1133,14 @@ jobs:
 
     it("validates event payload", async () => {
       const input = `
-on: push
+on: [push, pull_request]
 
 jobs:
   test:
     runs-on: ubuntu-latest
     steps:
       - run: echo \${{ github.event.forced }}
+      - run: echo \${{ github.event.pull_request }}
       - run: echo \${{ github.event.schedule }}
 `;
 
@@ -1151,11 +1152,11 @@ jobs:
           range: {
             end: {
               character: 46,
-              line: 8
+              line: 9
             },
             start: {
               character: 18,
-              line: 8
+              line: 9
             }
           },
           severity: DiagnosticSeverity.Warning