Merge pull request #6 from AChangFeng/main

camilesing · web-flow · commit 182c80ac3eee · 2023-04-05T21:04:53.000+08:00
add flink sql formatter
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,24 +23,39 @@
     },
     "homepage": "https://github.com/camilesing/flink-sql-vscode/master/README.md",
     "categories": [
-        "Programming Languages", "Formatters"
+        "Programming Languages",
+        "Formatters"
     ],
     "keywords": [
-        "Flink SQL", "Flink", "Formatter"
+        "Flink SQL",
+        "Flink",
+        "Formatter"
     ],
     "preview": false,
     "contributes": {
-        "languages": [{
-            "id": "flink-sql",
-            "aliases": ["FlinkSQL", "flink-sql", "Flink SQL","fql"],
-            "extensions": [".sql", ".fql"],
-            "configuration": "./language-configuration.json"
-        }],
-        "grammars": [{
-            "language": "flink-sql",
-            "scopeName": "source.flink",
-            "path": "./syntaxes/flink.tmLanguage.json"
-        }],
+        "languages": [
+            {
+                "id": "flink-sql",
+                "aliases": [
+                    "FlinkSQL",
+                    "flink-sql",
+                    "Flink SQL",
+                    "fql"
+                ],
+                "extensions": [
+                    ".sql",
+                    ".fql"
+                ],
+                "configuration": "./language-configuration.json"
+            }
+        ],
+        "grammars": [
+            {
+                "language": "flink-sql",
+                "scopeName": "source.flink",
+                "path": "./syntaxes/flink.tmLanguage.json"
+            }
+        ],
         "snippets": [
             {
                 "language": "flink-sql",
@@ -49,11 +64,11 @@
         ]
     },
     "activationEvents": [
-        "onLanguage:sql",
+        "onLanguage:fql",
         "onLanguage:flink-sql"
-      ],
+    ],
     "main": "./src/extension.js",
     "dependencies": {
-        "sql-formatter-plus": "^1.3.6"
+        "sql-formatter-plus": "git+ssh://git@github.com:AChangFeng/sql-formatter-plus.git#v0.0.1"
     }
 }
diff --git a/src/extension.js b/src/extension.js
@@ -5,7 +5,7 @@ const sqlFormatter = require('sql-formatter-plus');
 
 const config = {
 	indent: ' '.repeat(2),
-	language: 'sql',
+	language: 'fql',
 	uppercase: true,
 	linesBetweenQueries: 2
 }
@@ -20,7 +20,7 @@ module.exports.activate = () => {
 			vscode.TextEdit.replace(range, format(document.getText(range)))
 		]
 	});
-	vscode.languages.registerDocumentRangeFormattingEditProvider('sql', {
+	vscode.languages.registerDocumentRangeFormattingEditProvider('fql', {
 		provideDocumentRangeFormattingEdits: (document, range, options) => [
 			vscode.TextEdit.replace(range, format(document.getText(range)))
 		]

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ const sqlFormatter = require('sql-formatter-plus');`
`5`	`5`
`6`	`6`	`const config = {`
`7`	`7`	`indent: ' '.repeat(2),`
`8`		`- language: 'sql',`
	`8`	`+ language: 'fql',`
`9`	`9`	`uppercase: true,`
`10`	`10`	`linesBetweenQueries: 2`
`11`	`11`	`}`
`@@ -20,7 +20,7 @@ module.exports.activate = () => {`
`20`	`20`	`vscode.TextEdit.replace(range, format(document.getText(range)))`
`21`	`21`	`]`
`22`	`22`	`});`
`23`		`- vscode.languages.registerDocumentRangeFormattingEditProvider('sql', {`
	`23`	`+ vscode.languages.registerDocumentRangeFormattingEditProvider('fql', {`
`24`	`24`	`provideDocumentRangeFormattingEdits: (document, range, options) => [`
`25`	`25`	`vscode.TextEdit.replace(range, format(document.getText(range)))`
`26`	`26`	`]`