sort tokens

KxSystems · May 21, 2024 · 341ebe1 · 341ebe1
1 parent d755abd
commit 341ebe1
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 5 deletions.
diff --git a/server/src/linter/checks.ts b/server/src/linter/checks.ts
@@ -67,6 +67,14 @@ export function unusedVar(tokens: Token[]): Token[] {
 export function declaredAfterUse(tokens: Token[]): Token[] {
   return tokens
     .filter((token) => !inParam(token) && assigned(token) && assignable(token))
+    .sort((a, b) =>
+      identifier(a) < identifier(b)
+        ? -1
+        : identifier(a) > identifier(b)
+          ? 1
+          : (a.order || 0) - (b.order || 0),
+    )
+    .filter((e, i, a) => !a[i - 1] || identifier(e) !== identifier(a[i - 1]))
     .filter((token) =>
       tokens.find(
         (target) =>

diff --git a/server/src/parser/parser.ts b/server/src/parser/parser.ts
@@ -186,9 +186,6 @@ export function parse(text: string): Token[] {
 
     switch (token.tokenType) {
       case LBracket:
-      case LParen:
-      case LCurly:
-      case LSql:
         next = peek(cache);
         if (next) {
           next.tangled = token;
@@ -197,6 +194,12 @@ export function parse(text: string): Token[] {
         scope.push(token);
         cache.push(token);
         break;
+      case LParen:
+      case LCurly:
+      case LSql:
+        scope.push(token);
+        cache.push(token);
+        break;
       case RParen:
       case RBracket:
       case RCurly:

diff --git a/server/src/parser/utils.ts b/server/src/parser/utils.ts
@@ -67,8 +67,8 @@ export function inSql(token: Token) {
 }
 
 export function inTable(token: Token) {
-  const paren = inList(token);
-  return paren && paren.tangled?.tokenType === LBracket;
+  const list = inList(token);
+  return list && list.tangled?.tokenType === LBracket;
 }
 
 export function inParam(token: Token) {

diff --git a/test/suite/parser.test.ts b/test/suite/parser.test.ts
@@ -54,4 +54,19 @@ describe("TSQLint", () => {
     assert.strictEqual(result.length, 1);
     assert.strictEqual(result[0].code, "DECLARED_AFTER_USE");
   });
+  it("should not lint declaredAfterUse", () => {
+    const text = "a:1;a;a:1";
+    const result = lint(parse(text));
+    assert.strictEqual(result.length, 0);
+  });
+  it("should not lint declaredAfterUse", () => {
+    const text = "a;{a:1;a}";
+    const result = lint(parse(text));
+    assert.strictEqual(result.length, 0);
+  });
+  it("should not lint declaredAfterUse", () => {
+    const text = "[1=1;[a:1;b:1];[a;b]]";
+    const result = lint(parse(text));
+    assert.strictEqual(result.length, 0);
+  });
 });