Merge pull request #36 from prismagraphql/fix_syntax_highlighting

Fix syntax highlighting

Author: Divyendu Singh

grammars/graphql.json

@@ -195,38 +195,16 @@
       "comment":
         "need to prefix comment space with a scope else Atom's reflow cmd doesn't work",
       "name": "comment.line.graphql",
-      "match": "\\s*#.*"
+      "match": "#(?=([^\"]*\"[^\"]*\")*[^\"]*$).*$"
     },
     "graphql-description-singleline": {
-      "comment":
-        "In new graphql spec 0.12.0, the description have to be specified as doc-strings or single-line text in double quotes",
-      "name": "graphql.description",
-      "match": "^\\s*(\"(?:\"\")?)([^\"].*)(\"(?:\"\")?)$",
-      "captures": {
-        "1": { "name": "comment.quoted.double.graphql.begin" },
-        "2": { "name": "comment.description.graphql" },
-        "3": { "name": "comment.quoted.double.graphql.end" }
-      }
+      "name": "comment.line.number-sign.graphql",
+      "match": "#(?=([^\"]*\"[^\"]*\")*[^\"]*$).*$"
     },
     "graphql-description-docstring": {
-      "comment":
-        "In new graphql spec 0.12.0, the description have to be specified as doc-strings or single-line text in double quotes",
-      "name": "graphql.description",
-      "begin": "(\"\"\")(?:$|(.*))",
-      "beginCaptures": {
-        "1": { "name": "comment.quoted.double.graphql.begin" },
-        "2": { "name": "comment.block.description.graphql" }
-      },
-      "end": "^\\s*(\"\"\")$",
-      "endCaptures": {
-        "1": { "name": "comment.quoted.double.graphql.end" }
-      },
-      "patterns": [
-        {
-          "name": "comment.block.description.graphql",
-          "match": "^\\s*.*$"
-        }
-      ]
+      "name": "comment.block.graphql",
+      "begin": "\"\"\"",
+      "end": "\"\"\""
     },
     "graphql-variable-definitions": {
       "begin": "\\s*(\\()",

package-lock.json

@@ -3,8 +3,7 @@
   "private": false,
   "license": "MIT",
   "displayName": "GraphQL",
-  "description":
-    "GraphQL extension for VSCode adds syntax highlighting, validation, and language features like go to definition, hover information and autocompletion for graphql projects. This extension also works with queries annotated with gql tag.",
+  "description": "GraphQL extension for VSCode adds syntax highlighting, validation, and language features like go to definition, hover information and autocompletion for graphql projects. This extension also works with queries annotated with gql tag.",
   "icon": "assets/images/logo.png",
   "repository": {
     "type": "git",
@@ -15,7 +14,7 @@
     "color": "#032539",
     "theme": "dark"
   },
-  "version": "0.0.8",
+  "version": "0.0.9",
   "publisher": "Prisma",
   "engines": {
     "vscode": "^1.23.0"
@@ -40,8 +39,14 @@
     "languages": [
       {
         "id": "graphql",
-        "extensions": [".gql", ".graphql"],
-        "aliases": ["GraphQL", "graphql"],
+        "extensions": [
+          ".gql",
+          ".graphql"
+        ],
+        "aliases": [
+          "GraphQL",
+          "graphql"
+        ],
         "configuration": "./language/language-configuration.json"
       }
     ],
@@ -74,13 +79,18 @@
     ],
     "configuration": {
       "vscode-graphql.debug": {
-        "type": ["boolean", "null"],
+        "type": [
+          "boolean",
+          "null"
+        ],
         "title": "VSCode GraphQL - Debug Mode",
         "default": false,
         "description": "Enable debug logs"
       },
       "vscode-graphql.trace.server": {
-        "type": ["string"],
+        "type": [
+          "string"
+        ],
         "title": "VSCode GraphQL - Trace Language Server",
         "default": "off",
         "description": "Enable tracing for language server"
@@ -103,7 +113,8 @@
     "compile": "rimraf out && tsc -p ./",
     "watch": "tsc -watch -p ./",
     "postinstall": "node ./node_modules/vscode/bin/install",
-    "test": "npm run compile && node ./node_modules/vscode/bin/test"
+    "test": "npm run compile && node ./node_modules/vscode/bin/test",
+    "package": "vsce package"
   },
   "devDependencies": {
     "@types/graphql": "0.12.3",