فهرست منبع

HUE-5729 [editor] Move the * to the top in the autocomplete suggestions

Johan Ahlen 8 سال پیش
والد
کامیت
9d0f0e28c7

+ 13 - 13
desktop/core/src/desktop/static/desktop/js/autocomplete/jison/sql_main.jison

@@ -925,14 +925,14 @@ BasicIdentifierChain_EDIT
      suggestColumns({
        identifierChain: $1
      });
-     $$ = { suggestKeywords: [{ value: '*', weight: 1099 }] };
+     $$ = { suggestKeywords: [{ value: '*', weight: 10000 }] };
    }
  | BasicIdentifierChain AnyDot PartialBacktickedOrPartialCursor AnyDot BasicIdentifierChain
    {
      suggestColumns({
        identifierChain: $1
      });
-     $$ = { suggestKeywords: [{ value: '*', weight: 1099 }] };
+     $$ = { suggestKeywords: [{ value: '*', weight: 10000 }] };
    }
  ;
 
@@ -1281,9 +1281,9 @@ SelectStatement_EDIT
      if ($3.cursorAtStart) {
        var keywords = [];
        if ($2) {
-         keywords = [{ value: '*', weight: 1099 }];
+         keywords = [{ value: '*', weight: 10000 }];
        } else {
-         keywords = [{ value: '*', weight: 1099 }, 'ALL', 'DISTINCT'];
+         keywords = [{ value: '*', weight: 10000 }, 'ALL', 'DISTINCT'];
        }
        if (isImpala()) {
          keywords.push('STRAIGHT_JOIN');
@@ -1313,13 +1313,13 @@ SelectStatement_EDIT
    {
      var keywords = [];
      if ($2) {
-       keywords = [{ value: '*', weight: 1099 }];
+       keywords = [{ value: '*', weight: 10000 }];
        if ($2 === 'ALL') {
          suggestAggregateFunctions();
          suggestAnalyticFunctions();
        }
      } else {
-       keywords = [{ value: '*', weight: 1099 }, 'ALL', 'DISTINCT'];
+       keywords = [{ value: '*', weight: 10000 }, 'ALL', 'DISTINCT'];
        suggestAggregateFunctions();
        suggestAnalyticFunctions();
      }
@@ -1344,13 +1344,13 @@ SelectStatement_EDIT
    {
      var keywords = [];
      if ($2) {
-       keywords = [{ value: '*', weight: 1099 }];
+       keywords = [{ value: '*', weight: 10000 }];
        if ($2 === 'ALL') {
          suggestAggregateFunctions();
          suggestAnalyticFunctions();
        }
      } else {
-       keywords = [{ value: '*', weight: 1099 }, 'ALL', 'DISTINCT'];
+       keywords = [{ value: '*', weight: 10000 }, 'ALL', 'DISTINCT'];
        suggestAggregateFunctions();
        suggestAnalyticFunctions();
      }
@@ -2364,21 +2364,21 @@ SelectList_EDIT
    }
  | SelectList ',' AnyCursor
    {
-     $$ = { suggestKeywords: [{ value: '*', weight: 1099 }], suggestTables: true, suggestDatabases: true, suggestFunctions: true, suggestColumns: true, suggestAggregateFunctions: true };
+     $$ = { suggestKeywords: [{ value: '*', weight: 10000 }], suggestTables: true, suggestDatabases: true, suggestFunctions: true, suggestColumns: true, suggestAggregateFunctions: true };
    }
  | SelectList ',' SelectSpecification_EDIT                 -> $3
  | SelectList ',' AnyCursor SelectList
    {
-     $$ = { suggestKeywords: [{ value: '*', weight: 1099 }], suggestFunctions: true, suggestColumns: true, suggestAggregateFunctions: true,  };
+     $$ = { suggestKeywords: [{ value: '*', weight: 10000 }], suggestFunctions: true, suggestColumns: true, suggestAggregateFunctions: true,  };
    }
  | SelectList ',' AnyCursor ','
    {
-     $$ = { suggestKeywords: [{ value: '*', weight: 1099 }], suggestFunctions: true, suggestColumns: true, suggestAggregateFunctions: true,  };
+     $$ = { suggestKeywords: [{ value: '*', weight: 10000 }], suggestFunctions: true, suggestColumns: true, suggestAggregateFunctions: true,  };
    }
  | SelectList ',' SelectSpecification_EDIT ','             -> $3
  | SelectList ',' AnyCursor ',' SelectList
    {
-     $$ = { suggestKeywords: [{ value: '*', weight: 1099 }], suggestFunctions: true, suggestColumns: true, suggestAggregateFunctions: true,  };
+     $$ = { suggestKeywords: [{ value: '*', weight: 10000 }], suggestFunctions: true, suggestColumns: true, suggestAggregateFunctions: true,  };
    }
  | SelectList ',' SelectSpecification_EDIT ',' SelectList  -> $3
  ;
@@ -3347,7 +3347,7 @@ CountFunction_EDIT
    {
      valueExpressionSuggest();
      if (!$3) {
-       var keywords = isImpala() ? [{ value: '*', weight: 1099 }, 'ALL', 'DISTINCT'] : [{ value: '*', weight: 1099 }, 'DISTINCT'];
+       var keywords = isImpala() ? [{ value: '*', weight: 10000 }, 'ALL', 'DISTINCT'] : [{ value: '*', weight: 10000 }, 'DISTINCT'];
        if (parser.yy.result.suggestKeywords) {
          keywords = parser.yy.result.suggestKeywords.concat(keywords);
        }

+ 11 - 11
desktop/core/src/desktop/static/desktop/js/autocomplete/sql.js

@@ -320,7 +320,7 @@ case 698:
      suggestColumns({
        identifierChain: $$[$0-2]
      });
-     this.$ = { suggestKeywords: [{ value: '*', weight: 1099 }] };
+     this.$ = { suggestKeywords: [{ value: '*', weight: 10000 }] };
    
 break;
 case 699:
@@ -328,7 +328,7 @@ case 699:
      suggestColumns({
        identifierChain: $$[$0-4]
      });
-     this.$ = { suggestKeywords: [{ value: '*', weight: 1099 }] };
+     this.$ = { suggestKeywords: [{ value: '*', weight: 10000 }] };
    
 break;
 case 700: case 1168: case 1494:
@@ -514,9 +514,9 @@ case 799:
      if ($$[$0].cursorAtStart) {
        var keywords = [];
        if ($$[$0-1]) {
-         keywords = [{ value: '*', weight: 1099 }];
+         keywords = [{ value: '*', weight: 10000 }];
        } else {
-         keywords = [{ value: '*', weight: 1099 }, 'ALL', 'DISTINCT'];
+         keywords = [{ value: '*', weight: 10000 }, 'ALL', 'DISTINCT'];
        }
        if (isImpala()) {
          keywords.push('STRAIGHT_JOIN');
@@ -547,13 +547,13 @@ case 800:
 
      var keywords = [];
      if ($$[$0-1]) {
-       keywords = [{ value: '*', weight: 1099 }];
+       keywords = [{ value: '*', weight: 10000 }];
        if ($$[$0-1] === 'ALL') {
          suggestAggregateFunctions();
          suggestAnalyticFunctions();
        }
      } else {
-       keywords = [{ value: '*', weight: 1099 }, 'ALL', 'DISTINCT'];
+       keywords = [{ value: '*', weight: 10000 }, 'ALL', 'DISTINCT'];
        suggestAggregateFunctions();
        suggestAnalyticFunctions();
      }
@@ -579,13 +579,13 @@ case 803:
 
      var keywords = [];
      if ($$[$0-2]) {
-       keywords = [{ value: '*', weight: 1099 }];
+       keywords = [{ value: '*', weight: 10000 }];
        if ($$[$0-2] === 'ALL') {
          suggestAggregateFunctions();
          suggestAnalyticFunctions();
        }
      } else {
-       keywords = [{ value: '*', weight: 1099 }, 'ALL', 'DISTINCT'];
+       keywords = [{ value: '*', weight: 10000 }, 'ALL', 'DISTINCT'];
        suggestAggregateFunctions();
        suggestAnalyticFunctions();
      }
@@ -1578,12 +1578,12 @@ case 1171: case 1172: case 1562:
 break;
 case 1176:
 
-     this.$ = { suggestKeywords: [{ value: '*', weight: 1099 }], suggestTables: true, suggestDatabases: true, suggestFunctions: true, suggestColumns: true, suggestAggregateFunctions: true };
+     this.$ = { suggestKeywords: [{ value: '*', weight: 10000 }], suggestTables: true, suggestDatabases: true, suggestFunctions: true, suggestColumns: true, suggestAggregateFunctions: true };
    
 break;
 case 1178: case 1179: case 1181:
 
-     this.$ = { suggestKeywords: [{ value: '*', weight: 1099 }], suggestFunctions: true, suggestColumns: true, suggestAggregateFunctions: true,  };
+     this.$ = { suggestKeywords: [{ value: '*', weight: 10000 }], suggestFunctions: true, suggestColumns: true, suggestAggregateFunctions: true,  };
    
 break;
 case 1183:
@@ -2159,7 +2159,7 @@ case 1426:
 
      valueExpressionSuggest();
      if (!$$[$0-2]) {
-       var keywords = isImpala() ? [{ value: '*', weight: 1099 }, 'ALL', 'DISTINCT'] : [{ value: '*', weight: 1099 }, 'DISTINCT'];
+       var keywords = isImpala() ? [{ value: '*', weight: 10000 }, 'ALL', 'DISTINCT'] : [{ value: '*', weight: 10000 }, 'DISTINCT'];
        if (parser.yy.result.suggestKeywords) {
          keywords = parser.yy.result.suggestKeywords.concat(keywords);
        }