Changeset 2349 in kBuild

Timestamp:

May 17, 2009 11:13:35 AM (16 years ago)

Author:

bird

Message:

kdev.e: deal with multiple mlcomment and linecomment entries in 14+.

File:

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

trunk/VSlickMacros/kdev.e

@@ -185 +185 @@
     {
         /* multiline */
+#if __VERSION__>=14.0
+        _str aComments[];
+        GetComments(aComments, "mlcomment", sLexer)
+        for (i = 0; i < aComments._length(); i++)
+            if (!pos("documentation", aComments[i]) > 0)
+            {
+                sLine = aComments[i];
+                break;
+            }
+        if (sLine != '')
+#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
         {
             sLeft  = strip(word(sLine, 1));
@@ -197 +209 @@
 
         /* failed, try single line. */
+#if __VERSION__>=14.0
+        GetComments(aComments, "linecomment", sLexer)
+        for (i = 0; i < aComments._length(); i++)
+            if (!pos("documentation", aComments[i]) > 0)
+            {
+                sLine = aComments[i];
+                break;
+            }
+        if (sLine != '')
+#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
         {
             sLeft = strip(word(sLine, 1));
@@ -1172 +1195 @@
     int     iCursorLine;
     int     iPadd = k_alignup(11, p_SyntaxIndent);
+
     /* look for parameters */
     boolean fFoundFn = !k_func_goto_nearest_function();
@@ -1196 +1220 @@
         {
             _str sName, sType, sDefault;
-            if (!k_func_enumparams(sArgs, i, sType, sName, sDefault)
+            if (   !k_func_enumparams(sArgs, i, sType, sName, sDefault)
                 && iPadd2 < length(sName))
                 iPadd2 = length(sName);
         }
         iPadd2 = k_alignup((iPadd + iPadd2), p_SyntaxIndent);
+        if (iPadd2 < 28)
+            iPadd2 = k_alignup(28, p_SyntaxIndent);
 
         /*
@@ -1210 +1236 @@
             if (!k_func_enumparams(sArgs, i, sType, sName, sDefault))
             {
-                _str sStr3 = '';
+                _str sStr3 = '.';
                 if (sDefault != "")
                     sStr3 = '(default='sDefault')';