diff --git a/server/src/parser/tokens.ts b/server/src/parser/tokens.ts
index 9a83b887..7774cef2 100644
--- a/server/src/parser/tokens.ts
+++ b/server/src/parser/tokens.ts
@@ -23,13 +23,13 @@ import {
 
 export const BlockComment = createToken({
   name: "BlockComment",
-  pattern: /(?<=\r?\n)\/(?:[ \t]*\r?\n)[^\\]*\\?/, // TODO
+  pattern: /(?<=(\r?\n|[ \t]*))\/(?:[ \t]*\r?\n)[^\\]*\\?/,
   group: Lexer.SKIPPED,
 });
 
 export const LineComment = createToken({
   name: "LineComment",
-  pattern: /(?<=\r?\n|[ \t])\/.*/, // TODO
+  pattern: /(?:(?<=\r?\n|[ \t])|(?<!.))\/.*/,
   longer_alt: BlockComment,
   group: Lexer.SKIPPED,
 });
diff --git a/server/src/qLangServer.ts b/server/src/qLangServer.ts
index 774e88ff..6188d423 100644
--- a/server/src/qLangServer.ts
+++ b/server/src/qLangServer.ts
@@ -418,7 +418,7 @@ export default class QLangServer {
           ),
         },
         message: error.message,
-        source: "kdb q",
+        source: "kdb",
       };
       diagnostics.push(diagnostic);
     }
diff --git a/test/suite/parser.test.ts b/test/suite/parser.test.ts
index 08b8836e..5d3aa1c3 100644
--- a/test/suite/parser.test.ts
+++ b/test/suite/parser.test.ts
@@ -15,6 +15,28 @@ import * as assert from "assert";
 import { QParser } from "../../server/src/parser/parser";
 
 describe("QParser", () => {
+  describe("comments", () => {
+    it("should ignore block", () => {
+      QParser.parse("/\na:\n1\n\\");
+      assert.deepEqual(QParser.errors, []);
+    });
+
+    it("should ignore line", () => {
+      QParser.parse("/a:\n");
+      assert.deepEqual(QParser.errors, []);
+    });
+
+    it("should ignore inline", () => {
+      QParser.parse("a: 1 /a:\n");
+      assert.deepEqual(QParser.errors, []);
+    });
+
+    it("should not ignore overloaded slash", () => {
+      QParser.parse("a: ,/ a:\n");
+      assert.strictEqual(QParser.errors.length, 1);
+    });
+  });
+
   describe("script", () => {
     it("should parse empty", () => {
       QParser.parse("");