vscode-apollo 2.2.0 → 2.2.1

package/.github/workflows/build-prs.yml

@@ -0,0 +1,55 @@
+name: Bundle Extension as Artifact Download
+on:
+  pull_request:
+jobs:
+  test:
+    name: Bundle Extension as Artifact Download
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          cache: "npm"
+      - run: npm install
+      - run: echo PKG_VERSION="$(git show --no-patch --format=0.0.0-build.%ct.pr.${{ github.event.pull_request.number }}.commit.%h)" >> $GITHUB_ENV
+      - run: npm pkg set "version=${{ env.PKG_VERSION }}"
+      - run: npx -y @vscode/vsce package --out vscode-apollo-${{ env.PKG_VERSION }}.vsix
+
+      - uses: actions/upload-artifact@v4
+        id: artifact-upload-step
+        with:
+          name: vscode-apollo-${{ env.PKG_VERSION }}
+          path: vscode-apollo-${{ env.PKG_VERSION }}.vsix
+          retention-days: 14
+
+      - name: Output artifact URL
+        run: echo 'Artifact URL is ${{ steps.artifact-upload-step.outputs.artifact-url }}'
+
+      - name: Find Comment
+        uses: peter-evans/find-comment@v3
+        id: fc
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: "github-actions[bot]"
+          body-includes: <!-- ARTIFACT-DOWNLOAD -->
+
+      - name: Create comment
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          edit-mode: replace
+          body: |
+            <!-- ARTIFACT-DOWNLOAD -->
+            You can download the latest build of the extension for this PR here:
+            [vscode-apollo-${{ env.PKG_VERSION }}.zip](${{ steps.artifact-upload-step.outputs.artifact-url }}).
+
+            To install the extension, download the file, unzip it and install it in VS Code by selecting "Install from VSIX..." in the Extensions view.
+
+            Alternatively, run
+            ```sh
+            code --install-extension vscode-apollo-${{ env.PKG_VERSION }}.vsix --force
+            ```
+            from the command line.
+
+            For older builds, please see the edit history of this comment.

package/.github/workflows/release.yml

@@ -86,7 +86,7 @@ jobs:
                   "type": "section",
                   "text": {
                     "type": "mrkdwn",
-                    "text": "A new version of `vscode-apollo` was released: <https://github.com/apollographql/vscode-apollo/releases/tag/v${{ fromJson(steps.changesets.outputs.publishedPackages)[0].version }}|v${{ fromJson(steps.changesets.outputs.publishedPackages)[0].version }}> :rocket:"
+                    "text": "A new version of `vscode-apollo` was released: <https://github.com/apollographql/vscode-graphql/releases/tag/v${{ fromJson(steps.changesets.outputs.publishedPackages)[0].version }}|v${{ fromJson(steps.changesets.outputs.publishedPackages)[0].version }}> :rocket:"
                   }
                 }
               ]

package/.gitleaks.toml

@@ -1,13 +1,13 @@
-# This file exists primarily to influence scheduled scans that Apollo runs of all repos in Apollo-managed orgs. 
+# This file exists primarily to influence scheduled scans that Apollo runs of all repos in Apollo-managed orgs.
 # This is an Apollo-Internal link, but more information about these scans is available here:
 # https://apollographql.atlassian.net/wiki/spaces/SecOps/pages/81330213/Everything+Static+Application+Security+Testing#Scheduled-Scans.1
-# 
+#
 # Apollo is using Gitleaks (https://github.com/gitleaks/gitleaks) to run these scans.
 # However, this file is not something that Gitleaks natively consumes. This file is an
 # Apollo-convention. Prior to scanning a repo, Apollo merges
 # our standard Gitleaks configuration (which is largely just the Gitleaks-default config) with
 # this file if it exists in a repo. The combined config is then used to scan a repo.
-# 
+#
 # We did this because the natively-supported allowlisting functionality in Gitleaks didn't do everything we wanted
 # or wasn't as robust as we needed. For example, one of the allowlisting options offered by Gitleaks depends on the line number
 # on which a false positive secret exists to allowlist it. (https://github.com/gitleaks/gitleaks#gitleaksignore).
@@ -24,3 +24,10 @@
             # See https://github.com/apollographql/vscode-graphql/blob/a905280c143991b3fd675f8b4c3a7da277ccf095/packages/apollo-language-server/src/engine/index.ts#L86
             "a905280c143991b3fd675f8b4c3a7da277ccf095"
         ]
+
+[[ rules ]]
+    id = "private-key"
+    [ rules.allowlist ]
+        paths = [
+            '''sampleWorkspace/httpSchema/self-signed.key$''',
+        ]

package/.vscodeignore

@@ -10,7 +10,6 @@ src
 .prettierrc
 .gitattributes
 codegen.yml
-graphql.configuration.json
 jest.*.ts
 jest.*.js
 package-lock.json

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 2.2.1
+
+### Patch Changes
+
+- [#198](https://github.com/apollographql/vscode-graphql/pull/198) [`3bebbdc4`](https://github.com/apollographql/vscode-graphql/commit/3bebbdc40faf8f9d62d0709de3312d5cb629af15) Thanks [@phryneas](https://github.com/phryneas)! - Change syntax highlighting of graphql object fields from "string" to "variable".
+
+- [#199](https://github.com/apollographql/vscode-graphql/pull/199) [`7c1172be`](https://github.com/apollographql/vscode-graphql/commit/7c1172be690488dbf0510c2d412cba502acd1468) Thanks [@phryneas](https://github.com/phryneas)! - Fix "Toggle Line Comment"
+
+- [#190](https://github.com/apollographql/vscode-graphql/pull/190) [`ec1e9927`](https://github.com/apollographql/vscode-graphql/commit/ec1e9927a178e75cae21d795d47426f40bf9d27b) Thanks [@phryneas](https://github.com/phryneas)! - Fix a bug that prevented `skipSSLValidation` from working.
+
 ## 2.2.0
 
 ### Minor Changes

package/package.json

@@ -2,7 +2,7 @@
   "name": "vscode-apollo",
   "displayName": "Apollo GraphQL",
   "description": "Rich editor support for GraphQL client and server development that seamlessly integrates with the Apollo platform",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "referenceID": "87197759-7617-40d0-b32e-46d378e907c7",
   "author": "Apollo GraphQL <opensource@apollographql.com>",
   "license": "MIT",
@@ -54,6 +54,7 @@
     "lz-string": "1.5.0",
     "minimatch": "10.0.1",
     "moment": "2.30.1",
+    "undici": "6.19.8",
     "vscode-languageclient": "9.0.1",
     "vscode-languageserver": "9.0.1",
     "vscode-languageserver-textdocument": "1.0.12",

package/sampleWorkspace/httpSchema/apollo.config.ts

@@ -3,6 +3,8 @@ export default {
     service: {
       name: "httpSchema",
       url: "http://localhost:7096/graphql",
+      // url: "https://localhost:7097/graphql",
+      // skipSSLValidation: true,
     },
   },
 };

package/sampleWorkspace/httpSchema/self-signed.crt

@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDkzCCAnugAwIBAgIUVNlDGdat5znvwWhOEFQLq7BWzNwwDQYJKoZIhvcNAQEL
+BQAwWTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDESMBAGA1UEAwwJbG9jYWxob3N0MB4X
+DTI0MDkwMjA4MTgwNloXDTM0MDgzMTA4MTgwNlowWTELMAkGA1UEBhMCQVUxEzAR
+BgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5
+IEx0ZDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvHLw9Ey0WoRLxjVIajxVAT4za1pUQw3E9mtl57DPHDcdGWR56S9w
+KPjmND5lrtALZ5K+EKqslJdPf6Uxzxpf6phVnwpFwq5hPeY/Gpm77HxpPiJ61Q9r
+fsYnLtGXiZta0kbdrisALB+3QykEHOerDUF3wGiVYVcpDu7WF/WcLaF+zUlgf1gQ
+RTa5B3HpdCk34LiKPm9IZpWRpgLC90ro+HP+nBo7FoLYwu+WiPxg49qWEUY8fk+d
+TuJVdH7lf8GxcfM2oCzhBGpT5O/t6lqYBkgZvvY3YAERmAxg/OSeuUa6ChOMLK2T
++2MRLy7eLaaeTmPMFjjrzFODCA2/ekfGVwIDAQABo1MwUTAdBgNVHQ4EFgQUpEu/
+mbpTwcOGdPZ8NhTl1e16G84wHwYDVR0jBBgwFoAUpEu/mbpTwcOGdPZ8NhTl1e16
+G84wDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAhfSAl9VFS+Fk
+Wkmsl1ndoXvLWVDy36YepbNfXUeB+iwebIgdyZhNu6VdpcHsPNBuUV4wr4mgZ7PK
+Ksp3kKdqTDTAfBzHNBiOK7QgGyrDQJa0/Nn8ifmS+TYYCOs4FnkOXCUFipXCCMaS
+KzFYc9Ls4jtAxiSN58NmwxW9fqRHqwHW4o2Z/aNx4EnCEat0x4QcAqq/qfEodmjH
+jI7/AKb4UE+yEcJnZSlUDdpM4zPM3FcjmY7JVyfd/CziywR7rHGbLz7XQcCkYyDv
+5xqz0Lvk0ZtOC73cFWS41qfh8lrt34CNPoG7EaPFf+tMwhvjNooDHMQCb8y1A0Y3
+2yaDZNbCbQ==
+-----END CERTIFICATE-----

package/sampleWorkspace/httpSchema/self-signed.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC8cvD0TLRahEvG
+NUhqPFUBPjNrWlRDDcT2a2XnsM8cNx0ZZHnpL3Ao+OY0PmWu0Atnkr4QqqyUl09/
+pTHPGl/qmFWfCkXCrmE95j8ambvsfGk+InrVD2t+xicu0ZeJm1rSRt2uKwAsH7dD
+KQQc56sNQXfAaJVhVykO7tYX9ZwtoX7NSWB/WBBFNrkHcel0KTfguIo+b0hmlZGm
+AsL3Suj4c/6cGjsWgtjC75aI/GDj2pYRRjx+T51O4lV0fuV/wbFx8zagLOEEalPk
+7+3qWpgGSBm+9jdgARGYDGD85J65RroKE4wsrZP7YxEvLt4tpp5OY8wWOOvMU4MI
+Db96R8ZXAgMBAAECggEAGRrrnHLZi2jY2sDUyF5dlAr6zlWcKHYITtceSNWmXyO9
+Ky8BChPen9QPgFdDCZ0VX94jQaooeqqGa0K71ijf2ADPq0ky46LX4+dYHHhC762K
+rGiV2kDceROh5bFYvFAniHWWE8gOalJsAjT6eMqo4DJgEeXSPMO1UxQguSlofdrX
+9PIkRmsmQVmVh17V4RJhhW/qg8r75OwpM1uFTknikaXwd9Rw5/HZhW4hXP5EeM2x
+rcaYtXudhUyG/AWCrRPpHdGGNpHPmpwKUw3uADYAb2Hicjswx34kmWAbcwVJMs8d
+3QR/4hyrJnVSgYAB8/5oiNsnvaF/sO6/9KkDFpF03QKBgQDxrVJznfA0xgeVTGxt
+sLRhbsUyVn5tHteEdbvbTGLfl80Dayzlht9rTrjYXgQUevw40+chQW8LPEA8gmyM
+oCyAMouk+DJ5rl75jQnQh1/pob+ReyFi7Jl4D6Ro8J6gP6nds+wZ/BN5WLNtd/KI
+BMwi4fEyKjT7nKTVFNQlrZEG6wKBgQDHng2nFYbSEKv1lb5HabSxJ1bbTHld0lzI
+tn5zEmZ9PW6jBM0UJMEmkPRAvzhGGnzbRM0hYhiZR1FBR9T6BCJb+1N0HfT0Xo2X
+MTOuz8auLRtH73SCRbRoxVbz+TFmLVQuwAXdwIT+p4AgEqoJ+QyMKwuwr70AGZmm
+SkL08Bp7RQKBgQDYZfOgJtmAx5jerFGiXkkFvSPBkQUfPDCKIMmW8WzO/KPL3dmT
+pBLFiPWmd3h7xiu1zrf0ZRzDGK4EAFymBn4SRDAaBUtc/S95kDoriCvvjK912qTo
+aSZ6BLeYZ2wB3T+CjqpoEfh1/WCcMnzuIi2PRnSsEHLkoTxOt5nGKwXjBQKBgDve
+o6mhQzZt2aVmrBMvGQqpCdvsK9p/5WQtl+9bbXHSowQxxHBuNaAjiZ6Bu5cLCreZ
+Aw0oJsiSI0S5Dp+N7eA4mOcStQ017rGSCDY+CxDiZnRE1WTdEyb5SQMTkkVbAwyi
+ex/vRfQ6uKrl7infkGvZ3T+49a65/uNpEnv0J30hAoGBAJwhlCGf3BhMPrXjXGsp
+qxtCAbnaARErq0cI/nP6EKv8U0zOte09j/KKqFhckzsN3Df+P7dSuciIbFEDFY8Y
+aWVRMDF/owMo7qrb/Hyvt72gRtRAeypN1Zf7Uy7JtP7PMqdvMynK0xSdrGAl4UCV
+6AOSsKQotsgA2R1PKV89Rn2R
+-----END PRIVATE KEY-----

package/src/__e2e__/mockServer.js

@@ -1,19 +1,43 @@
 // @ts-check
-const http = require("http");
 const {
   parseRequestParams,
   createHandler,
 } = require("graphql-http/lib/use/http");
 const { buildSchema } = require("graphql");
 const { Trie } = require("@wry/trie");
+const { readFileSync } = require("fs");
+const { join } = require("path");
 
-function runMockServer(
+async function runMockServer(
   /** @type {number}  */ port,
-  onStart = (/** @type {number}  */ port) => {},
+  useSelfSignedCert = false,
+  onStart = (/** @type {string}  */ baseUri) => {},
 ) {
   const mocks = new Trie(false);
 
-  const server = http.createServer(async (req, res) => {
+  /**
+   *
+   * @param {import('node:http').RequestListener} listener
+   * @returns
+   */
+  function createServer(listener) {
+    if (useSelfSignedCert) {
+      return require("node:https").createServer(
+        {
+          key: readFileSync(
+            join(__dirname, "../../sampleWorkspace/httpSchema/self-signed.key"),
+          ),
+          cert: readFileSync(
+            join(__dirname, "../../sampleWorkspace/httpSchema/self-signed.crt"),
+          ),
+        },
+        listener,
+      );
+    }
+    return require("node:http").createServer(listener);
+  }
+
+  const server = createServer(async (req, res) => {
     if (req.url === "/apollo") {
       if (req.method === "POST") {
         await handleApolloPost(req, res);
@@ -33,8 +57,9 @@ function runMockServer(
 
   console.log("Starting server...");
   server.listen(port);
-  onStart(port);
-  console.log(`Server ready at: http://localhost:${port}`);
+  const baseUri = `${useSelfSignedCert ? "https" : "http"}://localhost:${port}`;
+  await onStart(baseUri);
+  console.log(`Server ready at: ${baseUri}`);
   return {
     [Symbol.dispose]() {
       console.log("Closing server...");
@@ -45,8 +70,8 @@ function runMockServer(
 
   /**
    * Mock GraphQL Endpoint Handler
-   * @param {http.IncomingMessage} req
-   * @param {http.ServerResponse} res
+   * @param {import('node:http').IncomingMessage} req
+   * @param {import('node:http').ServerResponse} res
    */
   async function handleApolloPost(req, res) {
     const { operationName, variables } =
@@ -79,8 +104,8 @@ function runMockServer(
 
   /**
    * Handler to accept new GraphQL Mocks
-   * @param {http.IncomingMessage} req
-   * @param {http.ServerResponse} res
+   * @param {import('node:http').IncomingMessage} req
+   * @param {import('node:http').ServerResponse} res
    */
   async function handleApolloPut(req, res) {
     const body = await new Promise((resolve) => {
@@ -111,7 +136,8 @@ const schemaHandler = createHandler({
 });
 
 if (require.main === module) {
-  runMockServer(7096, require("./mocks.js").loadDefaultMocks);
+  runMockServer(7096, false, require("./mocks.js").loadDefaultMocks);
+  runMockServer(7097, true, require("./mocks.js").loadDefaultMocks);
 }
 
 module.exports.runMockServer = runMockServer;

package/src/__e2e__/mocks.js

@@ -1,26 +1,30 @@
 // @ts-check
-
-async function loadDefaultMocks(/** @type {number} */ port) {
-  await sendMock(port, FrontendUrlRoot);
-  await sendMock(port, SchemaTagsAndFieldStats);
-  await sendMock(port, GetSchemaByTag);
+async function loadDefaultMocks(/** @type {string} */ baseUri) {
+  await sendMock(baseUri, FrontendUrlRoot);
+  await sendMock(baseUri, SchemaTagsAndFieldStats);
+  await sendMock(baseUri, GetSchemaByTag);
 }
 
 function sendMock(
-  /** @type {number} */ port,
+  /** @type {string} */ baseUri,
   /** @type { { operationName: string, variables: Record<string, string>, response: unknown }} */ {
     operationName,
     variables,
     response,
   },
 ) {
-  return fetch(`http://localhost:${port}/apollo`, {
+  return require("undici").fetch(`${baseUri}/apollo`, {
     method: "PUT",
     body: JSON.stringify({
       operationName,
       variables,
       response,
     }),
+    dispatcher: new (require("undici").Agent)({
+      connect: {
+        rejectUnauthorized: false,
+      },
+    }),
   });
 }
 

package/src/__e2e__/runTests.js

@@ -5,7 +5,7 @@ const { runMockServer } = require("./mockServer.js");
 const { loadDefaultMocks } = require("./mocks.js");
 
 async function main() {
-  let disposable;
+  const disposables = /**{@type Disposable[]}*/ [];
   try {
     // The folder containing the Extension Manifest package.json
     // Passed to `--extensionDevelopmentPath`
@@ -18,8 +18,12 @@ async function main() {
     const TEST_PORT = 7096;
     process.env.APOLLO_ENGINE_ENDPOINT = "http://localhost:7096/apollo";
     process.env.MOCK_SERVER_PORT = String(TEST_PORT);
-    disposable = runMockServer(TEST_PORT);
-    await loadDefaultMocks(TEST_PORT);
+    disposables.push(
+      ...(await Promise.all([
+        runMockServer(TEST_PORT, false, loadDefaultMocks),
+        runMockServer(TEST_PORT + 1, true, loadDefaultMocks),
+      ])),
+    );
     // Download VS Code, unzip it and run the integration test
     const exitCode = await runTests({
       extensionDevelopmentPath,
@@ -35,9 +39,7 @@ async function main() {
     console.error("Failed to run tests");
     process.exit(1);
   } finally {
-    if (disposable) {
-      disposable[Symbol.dispose]();
-    }
+    disposables.forEach((d) => d[Symbol.dispose]());
   }
 }
 

package/src/language-server/__e2e__/studioGraph.e2e.ts

@@ -37,9 +37,10 @@ Get detailed profile information about the current user (including the current u
 });
 
 test("wrong token", async () => {
+  const baseUri = `http://localhost:${mockPort}`;
   try {
-    await mocks.sendMock(mockPort, mocks.GetSchemaByTag_WRONG_TOKEN);
-    await mocks.sendMock(mockPort, mocks.SchemaTagsAndFieldStats_WRONG_TOKEN);
+    await mocks.sendMock(baseUri, mocks.GetSchemaByTag_WRONG_TOKEN);
+    await mocks.sendMock(baseUri, mocks.SchemaTagsAndFieldStats_WRONG_TOKEN);
 
     const ext = getExtension();
     ext.outputChannel.clear();
@@ -59,7 +60,7 @@ Invalid credentials provided
     at new ApolloError`.trim(),
     );
   } finally {
-    await mocks.loadDefaultMocks(mockPort);
+    await mocks.loadDefaultMocks(baseUri);
     await reloadService();
   }
 });

package/src/language-server/config/config.ts

@@ -110,12 +110,12 @@ const roverConfig = z.object({
     .preprocess((value) => {
       if (value !== undefined) return value;
       const configPath = contextStore.getStore()?.configPath!;
-      const supergraphConfig = join(configPath, "supergraph.yml");
+      const supergraphConfig = join(configPath, "supergraph.yaml");
       return existsSync(supergraphConfig) ? supergraphConfig : undefined;
     }, z.string().nullable().optional())
     .describe(
-      "The path to your `supergraph.yml` file. \n" +
-        "Defaults to a `supergraph.yml` in the folder of your `apollo.config.js`, if there is one.",
+      "The path to your `supergraph.yaml` file. \n" +
+        "Defaults to a `supergraph.yaml` in the folder of your `apollo.config.js`, if there is one.",
     ),
   extraArgs: z
     .array(z.string())

package/src/language-server/project/rover/DocumentSynchronization.ts

@@ -99,10 +99,17 @@ export class DocumentSynchronization {
   private pendingDocumentChanges = new Map<DocumentUri, TextDocument>();
   private knownFiles = new Map<
     DocumentUri,
-    {
-      full: TextDocument;
-      parts: ReadonlyArray<FilePart>;
-    }
+    | {
+        source: "editor";
+        full: TextDocument;
+        parts: ReadonlyArray<FilePart>;
+      }
+    | {
+        source: "lsp";
+        full: Pick<TextDocument, "uri">;
+        parts?: undefined;
+        diagnostics?: Diagnostic[];
+      }
   >();
 
   constructor(
@@ -158,7 +165,11 @@ export class DocumentSynchronization {
     const newObj = Object.fromEntries(
       newParts.map((p) => [p.fractionalIndex, p]),
     );
-    this.knownFiles.set(document.uri, { full: document, parts: newParts });
+    this.knownFiles.set(document.uri, {
+      source: "editor",
+      full: document,
+      parts: newParts,
+    });
 
     for (const newPart of newParts) {
       const previousPart = previousObj[newPart.fractionalIndex];
@@ -198,7 +209,9 @@ export class DocumentSynchronization {
 
   async resendAllDocuments() {
     for (const file of this.knownFiles.values()) {
-      await this.sendDocumentChanges(file.full, []);
+      if (file.source === "editor") {
+        await this.sendDocumentChanges(file.full, []);
+      }
     }
   }
 
@@ -208,7 +221,7 @@ export class DocumentSynchronization {
     this.documentDidChange(params.document);
   };
 
-  onDidCloseTextDocument: NonNullable<GraphQLProject["onDidClose"]> = (
+  onDidCloseTextDocument: NonNullable<GraphQLProject["onDidClose"]> = async (
     params,
   ) => {
     const known = this.knownFiles.get(params.document.uri);
@@ -216,15 +229,15 @@ export class DocumentSynchronization {
       return;
     }
     this.knownFiles.delete(params.document.uri);
-    return Promise.all(
-      known.parts.map((part) =>
-        this.sendNotification(DidCloseTextDocumentNotification.type, {
+    if (known.source === "editor") {
+      for (const part of known.parts) {
+        await this.sendNotification(DidCloseTextDocumentNotification.type, {
           textDocument: {
             uri: getUri(known.full, part),
           },
-        }),
-      ),
-    );
+        });
+      }
+    }
   };
 
   async documentDidChange(document: TextDocument) {
@@ -254,7 +267,7 @@ export class DocumentSynchronization {
   ): Promise<T | undefined> {
     await this.synchronizedWithDocument(positionParams.textDocument.uri);
     const found = this.knownFiles.get(positionParams.textDocument.uri);
-    if (!found) {
+    if (!found || found.source !== "editor") {
       return;
     }
     const match = findContainedSourceAndPosition(
@@ -274,11 +287,14 @@ export class DocumentSynchronization {
   handlePartDiagnostics(params: PublishDiagnosticsParams) {
     DEBUG && console.log("Received diagnostics", params);
     const uriDetails = splitUri(params.uri);
-    if (!uriDetails) {
-      return;
-    }
     const found = this.knownFiles.get(uriDetails.uri);
-    if (!found) {
+    if (!found || found.source === "lsp") {
+      this.knownFiles.set(uriDetails.uri, {
+        source: "lsp",
+        full: { uri: uriDetails.uri },
+        diagnostics: params.diagnostics,
+      });
+      this.sendDiagnostics(params);
       return;
     }
     const part = found.parts.find(
@@ -304,13 +320,19 @@ export class DocumentSynchronization {
   }
 
   get openDocuments() {
-    return [...this.knownFiles.values()].map((f) => f.full);
+    return [...this.knownFiles.values()]
+      .filter((f) => f.source === "editor")
+      .map((f) => f.full);
   }
 
   clearAllDiagnostics() {
     for (const file of this.knownFiles.values()) {
-      for (const part of file.parts) {
-        part.diagnostics = [];
+      if (file.source === "editor") {
+        for (const part of file.parts) {
+          part.diagnostics = [];
+        }
+      } else {
+        file.diagnostics = [];
       }
       this.sendDiagnostics({ uri: file.full.uri, diagnostics: [] });
     }
@@ -332,7 +354,7 @@ export class DocumentSynchronization {
   ): Promise<SemanticTokens | null> {
     await this.synchronizedWithDocument(params.textDocument.uri);
     const found = this.knownFiles.get(params.textDocument.uri);
-    if (!found) {
+    if (!found || found.source !== "editor") {
       return null;
     }
     const allParts = await Promise.all(

package/src/language-server/providers/schema/endpoint.ts

@@ -17,7 +17,16 @@ import { RemoteServiceConfig } from "../../config";
 import { GraphQLSchemaProvider, SchemaChangeUnsubscribeHandler } from "./base";
 import { Debug } from "../../utilities";
 import { isString } from "util";
-
+import { fetch as undiciFetch, Agent } from "undici";
+
+const skipSSLValidationFetchOptions = {
+  // see https://github.com/nodejs/undici/issues/1489#issuecomment-1543856261
+  dispatcher: new Agent({
+    connect: {
+      rejectUnauthorized: false,
+    },
+  }),
+} satisfies import("undici").RequestInit;
 export class EndpointSchemaProvider implements GraphQLSchemaProvider {
   private schema?: GraphQLSchema;
   private federatedServiceSDL?: string;
@@ -28,11 +37,11 @@ export class EndpointSchemaProvider implements GraphQLSchemaProvider {
     const { skipSSLValidation, url, headers } = this.config;
     const options: HttpOptions = {
       uri: url,
+      fetch: undiciFetch as typeof fetch,
     };
+
     if (url.startsWith("https:") && skipSSLValidation) {
-      options.fetchOptions = {
-        agent: new HTTPSAgent({ rejectUnauthorized: false }),
-      };
+      options.fetchOptions = skipSSLValidationFetchOptions;
     }
 
     const { data, errors } = (await toPromise(
@@ -92,12 +101,10 @@ export class EndpointSchemaProvider implements GraphQLSchemaProvider {
     const { skipSSLValidation, url, headers } = this.config;
     const options: HttpOptions = {
       uri: url,
-      fetch,
+      fetch: undiciFetch as typeof fetch,
     };
     if (url.startsWith("https:") && skipSSLValidation) {
-      options.fetchOptions = {
-        agent: new HTTPSAgent({ rejectUnauthorized: false }),
-      };
+      options.fetchOptions = skipSSLValidationFetchOptions;
     }
 
     const getFederationInfoQuery = `

package/syntaxes/graphql.json

@@ -601,8 +601,8 @@
     "graphql-object-field": {
       "match": "\\s*(([_A-Za-z][_0-9A-Za-z]*))\\s*(:)",
       "captures": {
-        "1": { "name": "constant.object.key.graphql" },
-        "2": { "name": "string.unquoted.graphql" },
+        "1": { "name": "string.unquoted.graphql" },
+        "2": { "name": "variable.object.key.graphql" },
         "3": { "name": "punctuation.graphql" }
       }
     },