Add missing nodes warning + grammar update

server/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Bash Language Server
 
+## 1.5.3
+
+* Support for showing warning for missing nodes
+
 ## 1.5.2
 
 * Upgrade `tree-sitter` to `0.13.5` and `tree-sitter-bash` to `0.13.2`

server/package.json

@@ -3,7 +3,7 @@
  "description": "A language server for Bash",
  "author": "Mads Hartmann",
  "license": "MIT",
- "version": "1.5.2",
+ "version": "1.5.3",
  "publisher": "mads-hartmann",
  "main": "out/server.js",
  "bin": {

server/src/__tests__/__snapshots__/analyzer.test.ts.snap

@@ -1,6 +1,25 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`analyze returns a list of errors for a file with errors 1`] = `
+exports[`analyze returns a list of errors for a file with a missing node 1`] = `
+Array [
+ Object {
+ "message": "Syntax error: expected \\"fi\\" somewhere in the file",
+ "range": Object {
+ "end": Object {
+ "character": 0,
+ "line": 12,
+ },
+ "start": Object {
+ "character": 0,
+ "line": 12,
+ },
+ },
+ "severity": 2,
+ },
+]
+`;
+
+exports[`analyze returns a list of errors for a file with parsing errors 1`] = `
 Array [
  Object {
  "message": "Failed to parse expression",

server/src/__tests__/analyzer.test.ts

@@ -9,12 +9,18 @@ beforeEach(() => {
 })
 
 describe('analyze', () => {
- it('returns an empty list for a file with no errors', () => {
+ it('returns an empty list of errors for a file with no parsing errors', () => {
  const result = analyzer.analyze(CURRENT_URI, FIXTURES.INSTALL)
  expect(result).toEqual([])
  })
 
- it('returns a list of errors for a file with errors', () => {
+ it('returns a list of errors for a file with a missing node', () => {
+ const result = analyzer.analyze(CURRENT_URI, FIXTURES.MISSING_NODE)
+ expect(result).not.toEqual([])
+ expect(result).toMatchSnapshot()
+ })
+
+ it('returns a list of errors for a file with parsing errors', () => {
  const result = analyzer.analyze(CURRENT_URI, FIXTURES.PARSE_PROBLEMS)
  expect(result).not.toEqual([])
  expect(result).toMatchSnapshot()

server/src/analyser.ts

@@ -241,7 +241,7 @@ export default class Analyzer {
 
  const problems = []
 
- TreeSitterUtil.forEach(tree.rootNode, n => {
+ TreeSitterUtil.forEach(tree.rootNode, (n: Parser.SyntaxNode) => {
  if (n.type === 'ERROR') {
  problems.push(
  LSP.Diagnostic.create(
@@ -277,6 +277,22 @@ export default class Analyzer {
  }
  })
 
+ function findMissingNodes(node: Parser.SyntaxNode) {
+ if (node.isMissing()) {
+ problems.push(
+ LSP.Diagnostic.create(
+ TreeSitterUtil.range(node),
+ `Syntax error: expected "${node.type}" somewhere in the file`,
+ LSP.DiagnosticSeverity.Warning,
+ ),
+ )
+ } else if (node.hasError()) {
+ node.children.forEach(findMissingNodes)
+ }
+ }
+
+ findMissingNodes(tree.rootNode)
+
  return problems
  }
 

testing/fixtures.ts

@@ -4,9 +4,14 @@ import * as LSP from 'vscode-languageserver'
 
 const base = path.join(__dirname, './fixtures/')
 
+function getFixture(filename: string) {
+ return LSP.TextDocument.create('foo', 'bar', 0, fs.readFileSync(path.join(base, filename), 'utf8'))
+}
+
 const FIXTURES = {
- INSTALL: LSP.TextDocument.create('foo', 'bar', 0, fs.readFileSync(path.join(base, 'install.sh'), 'utf8')),
- PARSE_PROBLEMS: LSP.TextDocument.create('foo', 'bar', 0, fs.readFileSync(path.join(base, 'parse-problems.sh'), 'utf8')),
+ MISSING_NODE: getFixture('missing-node.sh'),
+ INSTALL: getFixture('install.sh'),
+ PARSE_PROBLEMS: getFixture('parse-problems.sh'),
 }
 
 export default FIXTURES

testing/fixtures/missing-node.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+# set -x
+set -e
+
+PATH_INPUT=src/in.js
+PATH_OUTPUT=src/out.js
+
+if [[ $PATH_INPUT -nt $PATH_OUTPUT ]]; then
+ babel --compact false ${PATH_INPUT} > ${PATH_OUTPUT}
+f
+
+echo "test"

vscode-client/src/extension.ts

@@ -10,7 +10,7 @@ import {
 
 import { getServerInfo } from './util'
 
-const MINIMUM_SERVER_VERSION = '1.3.0'
+const MINIMUM_SERVER_VERSION = '1.5.2'
 
 export async function activate(context: ExtensionContext) {
  try {