Index: ext/repair/checkindex.c
==================================================================
--- ext/repair/checkindex.c
+++ ext/repair/checkindex.c
@@ -272,98 +272,128 @@
     }
     sqlite3_free(pIdx);
   }
 }
 
-#define CIDX_PARSE_EOF   0
-#define CIDX_PARSE_COMMA 1      /*  "," */
-#define CIDX_PARSE_OPEN  2      /*  "(" */
-#define CIDX_PARSE_CLOSE 3      /*  ")" */
-
-static int cidxFindNext(const char *zIn, const char **pzOut){
-  const char *z = zIn;
-
-  while( 1 ){
-    *pzOut = z;
-    switch( *z ){
-      case '\0':
-        return CIDX_PARSE_EOF;
-      case '(':
-        return CIDX_PARSE_OPEN;
-      case ')':
-        return CIDX_PARSE_CLOSE;
-      case ',':
-        return CIDX_PARSE_COMMA;
-
-      case '"': 
-      case '\'': 
-      case '`': {
-        char q = *z;
-        z++;
-        while( *z ){
-          if( *z==q ){
-            z++;
-            if( *z!=q ) break;
-          }
-          z++;
-        }
-        break;
-      }
-
-      case '[':
-        while( *z++!=']' );
-        break;
-
-      default:
-        z++;
-    }
-  }
-
-  assert( 0 );
-  return -1;
-}
-
 static int cidx_isspace(char c){
   return c==' ' || c=='\t' || c=='\r' || c=='\n';
 }
 
 static int cidx_isident(char c){
   return c<0 
     || (c>='0' && c<='9') || (c>='a' && c<='z') 
     || (c>='A' && c<='Z') || c=='_';
 }
+
+#define CIDX_PARSE_EOF   0
+#define CIDX_PARSE_COMMA 1      /*  "," */
+#define CIDX_PARSE_OPEN  2      /*  "(" */
+#define CIDX_PARSE_CLOSE 3      /*  ")" */
+
+static int cidxFindNext(
+  const char *zIn, 
+  const char **pzOut,
+  int *pbDoNotTrim                /* OUT: True if prev is -- comment */
+){
+  const char *z = zIn;
+
+  while( 1 ){
+    if( z[0]=='-' && z[1]=='-' ){
+      z += 2;
+      while( z[0]!='\n' ){
+        if( z[0]=='\0' ) return CIDX_PARSE_EOF;
+        z++;
+      }
+      while( cidx_isspace(*z) ) z++;
+      *pbDoNotTrim = 1;
+    }else{
+      *pzOut = z;
+      switch( *z ){
+        case '\0':
+          return CIDX_PARSE_EOF;
+        case '(':
+          return CIDX_PARSE_OPEN;
+        case ')':
+          return CIDX_PARSE_CLOSE;
+        case ',':
+          return CIDX_PARSE_COMMA;
+  
+        case '"': 
+        case '\'': 
+        case '`': {
+          char q = *z;
+          z++;
+          while( *z ){
+            if( *z==q ){
+              z++;
+              if( *z!=q ) break;
+            }
+            z++;
+          }
+          break;
+        }
+  
+        case '[':
+          while( *z++!=']' );
+          break;
+  
+        case '/':
+          if( z[1]=='*' ){
+            z += 2;
+            while( z[0]!='*' || z[1]!='/' ){
+              if( z[1]=='\0' ) return CIDX_PARSE_EOF;
+              z++;
+            }
+            z += 2;
+            break;
+          }
+  
+        default:
+          z++;
+          break;
+      }
+      *pbDoNotTrim = 0;
+    }
+  }
+
+  assert( 0 );
+  return -1;
+}
 
 static int cidxParseSQL(CidxCursor *pCsr, CidxIndex *pIdx, const char *zSql){
   const char *z = zSql;
   const char *z1;
   int e;
   int rc = SQLITE_OK;
   int nParen = 1;
+  int bDoNotTrim = 0;
   CidxColumn *pCol = pIdx->aCol;
 
-  e = cidxFindNext(z, &z);
+  e = cidxFindNext(z, &z, &bDoNotTrim);
   if( e!=CIDX_PARSE_OPEN ) goto parse_error;
   z1 = z+1;
   z++;
   while( nParen>0 ){
-    e = cidxFindNext(z, &z);
+    e = cidxFindNext(z, &z, &bDoNotTrim);
     if( e==CIDX_PARSE_EOF ) goto parse_error;
     if( (e==CIDX_PARSE_COMMA || e==CIDX_PARSE_CLOSE) && nParen==1 ){
       const char *z2 = z;
       if( pCol->zExpr ) goto parse_error;
 
-      while( cidx_isspace(z[-1]) ) z--;
-      if( 0==sqlite3_strnicmp(&z[-3], "asc", 3) && 0==cidx_isident(z[-4]) ){
-        z -= 3;
+      if( bDoNotTrim==0 ){
         while( cidx_isspace(z[-1]) ) z--;
-      }else
-      if( 0==sqlite3_strnicmp(&z[-4], "desc", 4) && 0==cidx_isident(z[-5]) ){
-        z -= 4;
-        while( cidx_isspace(z[-1]) ) z--;
+        if( !sqlite3_strnicmp(&z[-3], "asc", 3) && 0==cidx_isident(z[-4]) ){
+          z -= 3;
+          while( cidx_isspace(z[-1]) ) z--;
+        }else
+          if( !sqlite3_strnicmp(&z[-4], "desc", 4) && 0==cidx_isident(z[-5]) ){
+            z -= 4;
+            while( cidx_isspace(z[-1]) ) z--;
+          }
+        while( cidx_isspace(z1[0]) ) z1++;
       }
 
-      while( cidx_isspace(z1[0]) ) z1++;
       pCol->zExpr = cidxMprintf(&rc, "%.*s", z-z1, z1);
       pCol++;
       z = z1 = z2+1;
     }
     if( e==CIDX_PARSE_OPEN ) nParen++;

Index: test/checkindex.test
==================================================================
--- test/checkindex.test
+++ test/checkindex.test
@@ -316,8 +316,35 @@
   {} {'{"x":2, "y":2}',2} 
   {} {'{"x":3, "y":3}',3} 
   {} {'{"x":5, "y":5}',5}
 }
 
+#-------------------------------------------------------------------------
+#
+do_execsql_test 6.0 {
+  CREATE TABLE t6(x INTEGER PRIMARY KEY, y, z);
+  CREATE INDEX t6x1 ON t6(y, /* one,two,three */ z);
+  CREATE INDEX t6x2 ON t6(z, -- hello,world,
+  y);
+
+  CREATE INDEX t6x3 ON t6(z -- hello,world
+  , y);
+
+  INSERT INTO t6 VALUES(1, 2, 3);
+  INSERT INTO t6 VALUES(4, 5, 6);
+}
+
+do_index_check_test 6.1 t6x1 {
+  {} 2,3,1 
+  {} 5,6,4
+}
+do_index_check_test 6.2 t6x2 {
+  {} 3,2,1 
+  {} 6,5,4
+}
+do_index_check_test 6.2 t6x3 {
+  {} 3,2,1 
+  {} 6,5,4
+}
 
 finish_test