Changeset 3018 in kBuild

Timestamp:

Jan 7, 2017 12:06:39 AM (8 years ago)

Author:

bird

Message:

kdev.e: slickedit 21 fixes

File:

• trunk/SlickEdit/kdev.e (modified) (5 diffs)

trunk/SlickEdit/kdev.e

@@ -191 +191 @@
     {
         /* multiline */
-#if __VERSION__ >= 14.0
+#if __VERSION__ >= 21.0
+        COMMENT_TYPE aComments[];
+        GetComments(aComments, "M", sLexer);
+        for (i = 0; i < aComments._length(); i++)
+            if (!aComments[i].isDocumentation)
+            {
+                sLeft   = aComments[i].delim1;
+                sRight  = aComments[i].delim2;
+                iColumn = aComments[i].startcol;
+                if (sLeft != '' && sRight != '')
+                    return true;
+            }
+#else
+# if __VERSION__ >= 14.0
         _str aComments[] = null;
         GetComments(aComments, "mlcomment", sLexer);
         for (i = 0; i < aComments._length(); i++)
-            if (!pos("documentation", aComments[i]) > 0)
+            if (pos("documentation", aComments[i]) <= 0)
             {
                 sLine = aComments[i];
@@ -201 +214 @@
             }
         if (sLine != '')
-#else
+# else
         rc = _ini_get_value(slick_path_search("user.vlx"), sLexer, 'mlcomment', sLine);
         if (rc)
             rc = _ini_get_value(slick_path_search("vslick.vlx"), sLexer, 'mlcomment', sLine);
         if (!rc)
-#endif
+# endif
         {
             sLeft  = strip(word(sLine, 1));
@@ -213 +226 @@
                 return true;
         }
+#endif
 
         /* failed, try single line. */
-#if __VERSION__ >= 14.0
+#if __VERSION__ >= 21.0
+        GetComments(aComments, "L", sLexer);
+        for (i = 0; i < aComments._length(); i++)
+            if (!aComments[i].isDocumentation)
+            {
+                sLeft   = aComments[i].delim1;
+                sRight  = '';
+                iColumn = aComments[i].startcol;
+                if (sLeft != '')
+                    return true;
+            }
+#else
+# if __VERSION__ >= 14.0
         GetComments(aComments, "linecomment", sLexer)
         for (i = 0; i < aComments._length(); i++)
-            if (!pos("documentation", aComments[i]) > 0)
+            if (pos("documentation", aComments[i]) <= 0)
             {
                 sLine = aComments[i];
@@ -224 +250 @@
             }
         if (sLine != '')
-#else
+# else
         rc = _ini_get_value(slick_path_search("user.vlx"), sLexer, 'linecomment', sLine);
         if (rc)
             rc = _ini_get_value(slick_path_search("vslick.vlx"), sLexer, 'linecomment', sLine);
         if (!rc)
-#endif
+# endif
         {
             sLeft = strip(word(sLine, 1));
@@ -240 +266 @@
                 return true;
         }
+#endif
     }