vim: src/netbeans.c comparison

comparison src/netbeans.c @ 18808:7982f65d8f54 v8.1.2392

patch 8.1.2392: using old C style comments Commit: https://github.com/vim/vim/commit/6e0ce171e19d0118ecd7c2b16e2a1bd50aa76013 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Dec 5 20:12:41 2019 +0100 patch 8.1.2392: using old C style comments Problem: Using old C style comments. Solution: Use // comments where appropriate.

author	Bram Moolenaar <Bram@vim.org>
date	Thu, 05 Dec 2019 20:15:04 +0100
parents	1848b3e07266
children	435726a03481

comparison

equal deleted inserted replaced

-:7e28c71af59a
+:7982f65d8f54
 # endif
 #endif
 #include "version.h"
-#define GUARDED		10000 /* typenr for "guarded" annotation */
+#define GUARDED		10000 // typenr for "guarded" annotation
-#define GUARDEDOFFSET 1000000 /* base for "guarded" sign id's */
+#define GUARDEDOFFSET 1000000 // base for "guarded" sign id's
-#define MAX_COLOR_LENGTH 32 /* max length of color name in defineAnnoType */
+#define MAX_COLOR_LENGTH 32 // max length of color name in defineAnnoType
-/* The first implementation (working only with Netbeans) returned "1.1".  The
+// The first implementation (working only with Netbeans) returned "1.1".  The
-* protocol implemented here also supports A-A-P. */
+// protocol implemented here also supports A-A-P.
 static char *ExtEdProtocolVersion = "2.5";
 static long pos2off(buf_T *, pos_T *);
 static pos_T *off2pos(buf_T *, long);
 static pos_T *get_off_or_lnum(buf_T *buf, char_u **argp);
 static void nb_free(void);
 #define NETBEANS_OPEN (channel_can_write_to(nb_channel))
 static channel_T *nb_channel = NULL;
-static int r_cmdno;			/* current command number for reply */
+static int r_cmdno;			// current command number for reply
 static int dosetvisible = FALSE;
 /*
 * Include the debugging code if wanted.
 */
 if (NETBEANS_OPEN)
 {
 	netbeans_send_disconnect();
 	if (nb_channel != NULL)
 	{
-	    /* Close the socket and remove the input handlers. */
+	    // Close the socket and remove the input handlers.
 	    channel_close(nb_channel, TRUE);
 	    channel_clear(nb_channel);
 	}
 	nb_channel = NULL;
 }
 needupdate = 0;
 inAtomic = 0;
 nb_free();
-/* remove all signs and update the screen after gutter removal */
+// remove all signs and update the screen after gutter removal
 coloncmd(":sign unplace *");
 changed_window_setting();
 update_screen(CLEAR);
 setcursor();
 cursor_on();
 char	*fname;
 char	*arg = NULL;
 if (*params == '=')
 {
-	/* "=fname": Read info from specified file. */
+	// "=fname": Read info from specified file.
 	if (getConnInfo(params + 1, &hostname, &address, &password) == FAIL)
 	    return FAIL;
 }
 else
 {
 	if (*params == ':')
-	    /* ":<host>:<addr>:<password>": get info from argument */
+	    // ":<host>:<addr>:<password>": get info from argument
 	    arg = params + 1;
 	if (arg == NULL && (fname = getenv("__NETBEANS_CONINFO")) != NULL)
 	{
-	    /* "": get info from file specified in environment */
+	    // "": get info from file specified in environment
 	    if (getConnInfo(fname, &hostname, &address, &password) == FAIL)
 		return FAIL;
 	}
 	else
 	{
 	    if (arg != NULL)
 	    {
-		/* ":<host>:<addr>:<password>": get info from argument */
+		// ":<host>:<addr>:<password>": get info from argument
 		hostname = arg;
 		address = strchr(hostname, ':');
 		if (address != NULL)
 		{
 		    *address++ = '\0';
 		    if (password != NULL)
 			*password++ = '\0';
 		}
 	    }
-	    /* Get the missing values from the environment. */
+	    // Get the missing values from the environment.
 	    if (hostname == NULL || *hostname == '\0')
 		hostname = getenv("__NETBEANS_HOST");
 	    if (address == NULL)
 		address = getenv("__NETBEANS_SOCKET");
 	    if (password == NULL)
 		password = getenv("__NETBEANS_VIM_PASSWORD");
-	    /* Move values to allocated memory. */
+	    // Move values to allocated memory.
 	    if (hostname != NULL)
 		hostname = (char *)vim_strsave((char_u *)hostname);
 	    if (address != NULL)
 		address = (char *)vim_strsave((char_u *)address);
 	    if (password != NULL)
 		password = (char *)vim_strsave((char_u *)password);
 	}
 }
-/* Use the default when a value is missing. */
+// Use the default when a value is missing.
 if (hostname == NULL || *hostname == '\0')
 {
 	vim_free(hostname);
 	hostname = (char *)vim_strsave((char_u *)NB_DEF_HOST);
 }
 {
 	port = atoi(address);
 	nb_channel = channel_open(hostname, port, 3000, nb_channel_closed);
 	if (nb_channel != NULL)
 	{
-	    /* success */
+	    // success
 # ifdef FEAT_BEVAL_GUI
 	    bevalServers |= BEVAL_NETBEANS;
 # endif
-	    /* success, login */
+	    // success, login
 	    vim_snprintf(buf, sizeof(buf), "AUTH %s\n", password);
 	    nb_send(buf, "netbeans_connect");
 	    sprintf(buf, "0:version=0 \"%s\"\n", ExtEdProtocolVersion);
 	    nb_send(buf, "externaleditor_version");
 	nbdebug(("Cannot open NetBeans connection info file\n"));
 	PERROR("E660: Cannot open NetBeans connection info file");
 	return FAIL;
 }
-/* Read the file. There should be one of each parameter */
+// Read the file. There should be one of each parameter
 while ((lp = (char_u *)fgets((char *)buf, BUFSIZ, fp)) != NULL)
 {
 	if ((nlp = vim_strchr(lp, '\n')) != NULL)
-	    *nlp = 0;	    /* strip off the trailing newline */
+	    *nlp = 0;	    // strip off the trailing newline
 	if (STRNCMP(lp, "host=", 5) == 0)
 	{
 	    vim_free(*host);
 	    *host = (char *)vim_strsave(&buf[5]);
 struct keyqueue *prev;
 };
 typedef struct keyqueue keyQ_T;
-static keyQ_T keyHead; /* dummy node, header for circular queue */
+static keyQ_T keyHead; // dummy node, header for circular queue
 /*
 * Queue up key commands sent from netbeans.
 * We store the string, because it may depend on the global mod_mask and
 {
 keyQ_T *node;
 node = ALLOC_ONE(keyQ_T);
 if (node == NULL)
-	return;  /* out of memory, drop the key */
+	return;  // out of memory, drop the key
-if (keyHead.next == NULL) /* initialize circular queue */
+if (keyHead.next == NULL) // initialize circular queue
 {
 	keyHead.next = &keyHead;
 	keyHead.prev = &keyHead;
 }
-/* insert node at tail of queue */
+// insert node at tail of queue
 node->next = &keyHead;
 node->prev = keyHead.prev;
 keyHead.prev->next = node;
 keyHead.prev = node;
 {
 int postponed = FALSE;
 while (!postponed && keyHead.next && keyHead.next != &keyHead)
 {
-	/* first, unlink the node */
+	// first, unlink the node
 	keyQ_T *node = keyHead.next;
 	keyHead.next = node->next;
 	node->next->prev = node->prev;
-	/* Now, send the keycommand.  This may cause it to be postponed again
+	// Now, send the keycommand.  This may cause it to be postponed again
-	 * and change keyHead. */
+	// and change keyHead.
 	if (node->keystr != NULL)
 	    postponed = !netbeans_keystring(node->keystr);
 	vim_free(node->keystr);
-	/* Finally, dispose of the node */
+	// Finally, dispose of the node
 	vim_free(node);
 }
 }
 while (nb_channel != NULL)
 {
 	node = channel_peek(nb_channel, PART_SOCK);
 	if (node == NULL)
-	    break;	/* nothing to read */
+	    break;	// nothing to read
-	/* Locate the end of the first line in the first buffer. */
+	// Locate the end of the first line in the first buffer.
 	p = channel_first_nl(node);
 	if (p == NULL)
 	{
-	    /* Command isn't complete.  If there is no following buffer,
+	    // Command isn't complete.  If there is no following buffer,
-	     * return (wait for more). If there is another buffer following,
+	    // return (wait for more). If there is another buffer following,
-	     * prepend the text to that buffer and delete this one.  */
+	    // prepend the text to that buffer and delete this one.
 	    if (channel_collapse(nb_channel, PART_SOCK, TRUE) == FAIL)
 		return;
 	    continue;
 	}
-	/* There is a complete command at the start of the buffer.
+	// There is a complete command at the start of the buffer.
-	 * Terminate it with a NUL.  When no more text is following unlink
+	// Terminate it with a NUL.  When no more text is following unlink
-	 * the buffer.  Do this before executing, because new buffers can
+	// the buffer.  Do this before executing, because new buffers can
-	 * be added while busy handling the command. */
+	// be added while busy handling the command.
 	*p++ = NUL;
 	if (*p == NUL)
 	{
 	    own_node = TRUE;
 	    buffer = channel_get(nb_channel, PART_SOCK, NULL);
-	    /* "node" is now invalid! */
+	    // "node" is now invalid!
 	}
 	else
 	{
 	    own_node = FALSE;
 	    buffer = node->rq_buffer;
 	}
-	/* Now, parse and execute the commands.  This may set nb_channel to
+	// Now, parse and execute the commands.  This may set nb_channel to
-	 * NULL if the channel is closed. */
+	// NULL if the channel is closed.
 	nb_parse_cmd(buffer);
 	if (own_node)
-	    /* buffer finished, dispose of it */
+	    // buffer finished, dispose of it
 	    vim_free(buffer);
 	else if (nb_channel != NULL)
-	    /* more follows, move it to the start */
+	    // more follows, move it to the start
 	    channel_consume(nb_channel, PART_SOCK, (int)(p - buffer));
 }
 }
 /*
 int		bufno;
 int		isfunc = -1;
 if (STRCMP(cmd, "DISCONNECT") == 0)
 {
-	/* We assume the server knows that we can safely exit! */
+	// We assume the server knows that we can safely exit!
-	/* Disconnect before exiting, Motif hangs in a Select error
+	// Disconnect before exiting, Motif hangs in a Select error
-	 * message otherwise. */
+	// message otherwise.
 	netbeans_close();
 	getout(0);
-	/* NOTREACHED */
+	// NOTREACHED
 }
 if (STRCMP(cmd, "DETACH") == 0)
 {
 	buf_T	*buf;
 	FOR_ALL_BUFFERS(buf)
 	    buf->b_has_sign_column = FALSE;
-	/* The IDE is breaking the connection. */
+	// The IDE is breaking the connection.
 	netbeans_close();
 	return;
 }
 bufno = strtol((char *)cmd, &verb, 10);
 {
 	nbdebug(("    missing colon: %s\n", cmd));
 	semsg("E627: missing colon: %s", cmd);
 	return;
 }
-++verb; /* skip colon */
+++verb; // skip colon
 for (q = verb; *q; q++)
 {
 	if (*q == '!')
 	{
 };
 typedef struct nbbuf_struct nbbuf_T;
 static nbbuf_T *buf_list = NULL;
-static int buf_list_size = 0;	/* size of buf_list */
+static int buf_list_size = 0;	// size of buf_list
-static int buf_list_used = 0;	/* nr of entries in buf_list actually in use */
+static int buf_list_used = 0;	// nr of entries in buf_list actually in use
 static char **globalsignmap = NULL;
 static int globalsignmaplen = 0;
 static int globalsignmapused = 0;
 {
 keyQ_T *key_node = keyHead.next;
 nbbuf_T buf;
 int i;
-/* free the netbeans buffer list */
+// free the netbeans buffer list
 for (i = 0; i < buf_list_used; i++)
 {
 	buf = buf_list[i];
 	vim_free(buf.displayname);
 	vim_free(buf.signmap);
 }
 VIM_CLEAR(buf_list);
 buf_list_size = 0;
 buf_list_used = 0;
-/* free the queued key commands */
+// free the queued key commands
 while (key_node != NULL && key_node != &keyHead)
 {
 	keyQ_T *next = key_node->next;
 	vim_free(key_node->keystr);
 	vim_free(key_node);
 	    break;
 	}
 	key_node = next;
 }
-/* free the queued netbeans commands */
+// free the queued netbeans commands
 if (nb_channel != NULL)
 	channel_clear(nb_channel);
 }
 /*
 * non-buffer related command has been sent.
 */
 static nbbuf_T *
 nb_get_buf(int bufno)
 {
-/* find or create a buffer with the given number */
+// find or create a buffer with the given number
 int incr;
 if (bufno <= 0)
 	return NULL;
 if (!buf_list)
 {
-	/* initialize */
+	// initialize
 	buf_list = alloc_clear(100 * sizeof(nbbuf_T));
 	buf_list_size = 100;
 }
-if (bufno >= buf_list_used) /* new */
+if (bufno >= buf_list_used) // new
 {
-	if (bufno >= buf_list_size) /* grow list */
+	if (bufno >= buf_list_size) // grow list
 	{
 	    nbbuf_T *t_buf_list = buf_list;
 	    incr = bufno - buf_list_size + 90;
 	    buf_list_size += incr;
 						      incr * sizeof(nbbuf_T));
 	}
 	while (buf_list_used <= bufno)
 	{
-	    /* Default is to fire text changes. */
+	    // Default is to fire text changes.
 	    buf_list[buf_list_used].fireChanges = 1;
 	    ++buf_list_used;
 	}
 }
 {
 	if (!buf_list[i].bufp)
 	    continue;
 	if (netbeansForcedQuit)
 	{
-	    /* mark as unmodified so NetBeans won't put up dialog on "killed" */
+	    // mark as unmodified so NetBeans won't put up dialog on "killed"
 	    sprintf(buf, "%d:unmodified=%d\n", i, r_cmdno);
 	    nbdebug(("EVT: %s", buf));
 	    nb_send(buf, "netbeans_end");
 	}
 	sprintf(buf, "%d:killed=%d\n", i, r_cmdno);
 	nbdebug(("EVT: %s", buf));
-	/* nb_send(buf, "netbeans_end");    avoid "write failed" messages */
+	// nb_send(buf, "netbeans_end");    avoid "write failed" messages
 	nb_send(buf, NULL);
 }
 }
 /*
 {
 char reply[32];
 nbdebug(("REP %d: <none>\n", cmdno));
-/* Avoid printing an annoying error message. */
+// Avoid printing an annoying error message.
 if (!NETBEANS_OPEN)
 	return;
 sprintf(reply, "%d\n", cmdno);
 nb_send(reply, "nb_reply_nil");
 	switch (*p)
 	{
 	    case '\"':
 	    case '\\':
 		*q++ = '\\'; *q++ = *p; break;
-	 /* case '\t': */
+	 // case '\t':
-	 /*     *q++ = '\\'; *q++ = 't'; break; */
+	 //     *q++ = '\\'; *q++ = 't'; break;
 	    case '\n':
 		*q++ = '\\'; *q++ = 'n'; break;
 	    case '\r':
 		*q++ = '\\'; *q++ = 'r'; break;
 	    default:
 {
 char *result = 0;
 char *q;
 int done = 0;
-/* result is never longer than input */
+// result is never longer than input
 result = alloc_clear(STRLEN(p) + 1);
 if (result == NULL)
 	return NULL;
 if (*p++ != '"')
 		    case 'n':	*q++ = '\n';	break;
 		    case 't':	*q++ = '\t';	break;
 		    case 'r':	*q++ = '\r';	break;
 		    case '"':	*q++ = '"';	break;
 		    case NUL:	--p;		break;
-		    /* default: skip over illegal chars */
+		    // default: skip over illegal chars
 		}
 		++p;
 		break;
 	    default:
 int oldlen;
 int lastbyte = last;
 oldtext = ml_get(lnum);
 oldlen = (int)STRLEN(oldtext);
-if (first >= (colnr_T)oldlen || oldlen == 0)  /* just in case */
+if (first >= (colnr_T)oldlen || oldlen == 0)  // just in case
 	return;
 if (lastbyte >= oldlen)
 	lastbyte = oldlen - 1;
 newtext = alloc(oldlen - (int)(lastbyte - first));
 if (newtext != NULL)
 nb_do_cmd(
 int		bufno,
 char_u	*cmd,
 int		func,
 int		cmdno,
-char_u	*args)	    /* points to space before arguments or NUL */
+char_u	*args)	    // points to space before arguments or NUL
 {
 int		do_update = 0;
 long	off = 0;
 nbbuf_T	*buf = nb_get_buf(bufno);
 static int	skip = 0;
 int		retval = OK;
-char	*cp;	    /* for when a char pointer is needed */
+char	*cp;	    // for when a char pointer is needed
 nbdebug(("%s %d: (%d) %s %s\n", (func) ? "FUN" : "CMD", cmdno, bufno, cmd,
 	STRCMP(cmd, "insert") == 0 ? "<text>" : (char *)args));
 if (func)
 {
-/* =====================================================================*/
+// =====================================================================
 	if (streq((char *)cmd, "getModified"))
 	{
 	    if (buf == NULL || buf->bufp == NULL)
-		/* Return the number of buffers that are modified. */
+		// Return the number of buffers that are modified.
 		nb_reply_nr(cmdno, (long)count_changed_buffers());
 	    else
-		/* Return whether the buffer is modified. */
+		// Return whether the buffer is modified.
 		nb_reply_nr(cmdno, (long)(buf->bufp->b_changed
 					   || isNetbeansModified(buf->bufp)));
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "saveAndExit"))
 	{
-	    /* Note: this will exit Vim if successful. */
+	    // Note: this will exit Vim if successful.
 	    coloncmd(":confirm qall");
-	    /* We didn't exit: return the number of changed buffers. */
+	    // We didn't exit: return the number of changed buffers.
 	    nb_reply_nr(cmdno, (long)count_changed_buffers());
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "getCursor"))
 	{
 	    char_u text[200];
-	    /* Note: nb_getbufno() may return -1.  This indicates the IDE
+	    // Note: nb_getbufno() may return -1.  This indicates the IDE
-	     * didn't assign a number to the current buffer in response to a
+	    // didn't assign a number to the current buffer in response to a
-	     * fileOpened event. */
+	    // fileOpened event.
 	    sprintf((char *)text, "%d %ld %d %ld",
 		    nb_getbufno(curbuf),
 		    (long)curwin->w_cursor.lnum,
 		    (int)curwin->w_cursor.col,
 		    pos2off(curbuf, &curwin->w_cursor));
 	    nb_reply_text(cmdno, text);
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "getAnno"))
 	{
 	    long linenum = 0;
 #ifdef FEAT_SIGNS
 	    {
 		int serNum;
 		cp = (char *)args;
 		serNum = strtol(cp, &cp, 10);
-		/* If the sign isn't found linenum will be zero. */
+		// If the sign isn't found linenum will be zero.
 		linenum = (long)buf_findsign(buf->bufp, serNum, NULL);
 	    }
 #endif
 	    nb_reply_nr(cmdno, linenum);
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "getLength"))
 	{
 	    long len = 0;
 	    else
 	    {
 		len = get_buf_size(buf->bufp);
 	    }
 	    nb_reply_nr(cmdno, len);
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "getText"))
 	{
 	    long	len;
 	    linenr_T	nlines;
 	    else
 	    {
 		nb_reply_text(cmdno, text);
 		vim_free(text);
 	    }
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "remove"))
 	{
 	    long count;
 	    pos_T first, last;
 	    pos_T *pos;
 	    pos_T *next;
-	    linenr_T del_from_lnum, del_to_lnum;  /* lines to be deleted as a whole */
+	    linenr_T del_from_lnum, del_to_lnum;  // lines to be deleted as a whole
 	    int oldFire = netbeansFireChanges;
 	    int oldSuppress = netbeansSuppressNoLines;
 	    int wasChanged;
 	    if (skip >= SKIP_STOP)
 		wasChanged = buf->bufp->b_changed;
 		cp = (char *)args;
 		off = strtol(cp, &cp, 10);
 		count = strtol(cp, &cp, 10);
 		args = (char_u *)cp;
-		/* delete "count" chars, starting at "off" */
+		// delete "count" chars, starting at "off"
 		pos = off2pos(buf->bufp, off);
 		if (!pos)
 		{
 		    nbdebug(("    !bad position\n"));
 		    nb_reply_text(cmdno, (char_u *)"!bad position");
 							last.lnum, last.col));
 		del_from_lnum = first.lnum;
 		del_to_lnum = last.lnum;
 		do_update = 1;
-		/* Get the position of the first byte after the deleted
+		// Get the position of the first byte after the deleted
-		 * section.  "next" is NULL when deleting to the end of the
+		// section.  "next" is NULL when deleting to the end of the
-		 * file. */
+		// file.
 		next = off2pos(buf->bufp, off + count);
-		/* Remove part of the first line. */
+		// Remove part of the first line.
 		if (first.col != 0
 				|| (next != NULL && first.lnum == next->lnum))
 		{
 		    if (first.lnum != last.lnum
 			    || (next != NULL && first.lnum != next->lnum))
 		    {
-			/* remove to the end of the first line */
+			// remove to the end of the first line
 			nb_partialremove(first.lnum, first.col,
 							     (colnr_T)MAXCOL);
 			if (first.lnum == last.lnum)
 			{
-			    /* Partial line to remove includes the end of
+			    // Partial line to remove includes the end of
-			     * line.  Join the line with the next one, have
+			    // line.  Join the line with the next one, have
-			     * the next line deleted below. */
+			    // the next line deleted below.
 			    nb_joinlines(first.lnum, next->lnum);
 			    del_to_lnum = next->lnum;
 			}
 		    }
 		    else
 		    {
-			/* remove within one line */
+			// remove within one line
 			nb_partialremove(first.lnum, first.col, last.col);
 		    }
-		    ++del_from_lnum;  /* don't delete the first line */
+		    ++del_from_lnum;  // don't delete the first line
 		}
-		/* Remove part of the last line. */
+		// Remove part of the last line.
 		if (first.lnum != last.lnum && next != NULL
 			&& next->col != 0 && last.lnum == next->lnum)
 		{
 		    nb_partialremove(last.lnum, 0, last.col);
 		    if (del_from_lnum > first.lnum)
 		    {
-			/* Join end of last line to start of first line; last
+			// Join end of last line to start of first line; last
-			 * line is deleted below. */
+			// line is deleted below.
 			nb_joinlines(first.lnum, last.lnum);
 		    }
 		    else
-			/* First line is deleted as a whole, keep the last
+			// First line is deleted as a whole, keep the last
-			 * line. */
+			// line.
 			--del_to_lnum;
 		}
-		/* First is partial line; last line to remove includes
+		// First is partial line; last line to remove includes
-		 * the end of line; join first line to line following last
+		// the end of line; join first line to line following last
-		 * line; line following last line is deleted below. */
+		// line; line following last line is deleted below.
 		if (first.lnum != last.lnum && del_from_lnum > first.lnum
 			&& next != NULL && last.lnum != next->lnum)
 		{
 		    nb_joinlines(first.lnum, next->lnum);
 		    del_to_lnum = next->lnum;
 		}
-		/* Delete whole lines if there are any. */
+		// Delete whole lines if there are any.
 		if (del_to_lnum >= del_from_lnum)
 		{
 		    int i;
-		    /* delete signs from the lines being deleted */
+		    // delete signs from the lines being deleted
 		    for (i = del_from_lnum; i <= del_to_lnum; i++)
 		    {
 			int id = buf_findsign_id(buf->bufp, (linenr_T)i, NULL);
 			if (id > 0)
 			{
 		    curwin->w_cursor.lnum = del_from_lnum;
 		    curwin->w_cursor.col = 0;
 		    del_lines(del_to_lnum - del_from_lnum + 1, FALSE);
 		}
-		/* Leave cursor at first deleted byte. */
+		// Leave cursor at first deleted byte.
 		curwin->w_cursor = first;
 		check_cursor_lnum();
-		buf->bufp->b_changed = wasChanged; /* logically unchanged */
+		buf->bufp->b_changed = wasChanged; // logically unchanged
 		netbeansFireChanges = oldFire;
 		netbeansSuppressNoLines = oldSuppress;
 		u_blockfree(buf->bufp);
 		u_clearall(buf->bufp);
 	    }
 	    nb_reply_nil(cmdno);
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "insert"))
 	{
 	    char_u	*to_free;
 		nbdebug(("    Skipping %s command\n", (char *) cmd));
 		nb_reply_nil(cmdno);
 		return OK;
 	    }
-	    /* get offset */
+	    // get offset
 	    cp = (char *)args;
 	    off = strtol(cp, &cp, 10);
 	    args = (char_u *)cp;
-	    /* get text to be inserted */
+	    // get text to be inserted
 	    args = skipwhite(args);
 	    args = to_free = (char_u *)nb_unquote(args, NULL);
 	    /*
 	    nbdebug(("    CHUNK[%d]: %d bytes at offset %d\n",
 		    buf->bufp->b_ml.ml_line_count, STRLEN(args), off));
 		linenr_T lnum_start;
 		pos_T	*pos;
 		netbeansFireChanges = 0;
-		/* Jump to the buffer where we insert.  After this "curbuf"
+		// Jump to the buffer where we insert.  After this "curbuf"
-		 * can be used. */
+		// can be used.
 		nb_set_curbuf(buf->bufp);
 		old_b_changed = curbuf->b_changed;
-		/* Convert the specified character offset into a lnum/col
+		// Convert the specified character offset into a lnum/col
-		 * position. */
+		// position.
 		pos = off2pos(curbuf, off);
 		if (pos != NULL)
 		{
 		    if (pos->lnum <= 0)
 			lnum_start = 1;
 		    else
 			lnum_start = pos->lnum;
 		}
 		else
 		{
-		    /* If the given position is not found, assume we want
+		    // If the given position is not found, assume we want
-		     * the end of the file.  See setLocAndSize HACK. */
+		    // the end of the file.  See setLocAndSize HACK.
 		    if (buf_was_empty)
-			lnum_start = 1;	    /* above empty line */
+			lnum_start = 1;	    // above empty line
 		    else
 			lnum_start = curbuf->b_ml.ml_line_count + 1;
 		}
-		/* "lnum" is the line where we insert: either append to it or
+		// "lnum" is the line where we insert: either append to it or
-		 * insert a new line above it. */
+		// insert a new line above it.
 		lnum = lnum_start;
-		/* Loop over the "\n" separated lines of the argument. */
+		// Loop over the "\n" separated lines of the argument.
 		do_update = 1;
 		while (*args != NUL)
 		{
 		    nlp = vim_strchr(args, '\n');
 		    if (nlp == NULL)
 		    {
-			/* Incomplete line, probably truncated.  Next "insert"
+			// Incomplete line, probably truncated.  Next "insert"
-			 * command should append to this one. */
+			// command should append to this one.
 			len = STRLEN(args);
 		    }
 		    else
 		    {
 			len = nlp - args;
 		    {
 			char_u	*oldline = ml_get(lnum);
 			char_u	*newline;
 			int	col = pos == NULL ? 0 : pos->col;
-			/* Insert halfway a line. */
+			// Insert halfway a line.
 			newline = alloc(STRLEN(oldline) + len + 1);
 			if (newline != NULL)
 			{
 			    mch_memmove(newline, oldline, (size_t)col);
 			    newline[col] = NUL;
 			    ml_replace(lnum, newline, FALSE);
 			}
 		    }
 		    else
 		    {
-			/* Append a new line.  Not that we always do this,
+			// Append a new line.  Not that we always do this,
-			 * also when the text doesn't end in a "\n". */
+			// also when the text doesn't end in a "\n".
 			ml_append((linenr_T)(lnum - 1), args,
 						   (colnr_T)(len + 1), FALSE);
 			++added;
 		    }
 			break;
 		    ++lnum;
 		    args = nlp + 1;
 		}
-		/* Adjust the marks below the inserted lines. */
+		// Adjust the marks below the inserted lines.
 		appended_lines_mark(lnum_start - 1, (long)added);
 		/*
 		 * When starting with an empty buffer set the fileformat.
 		 * This is just guessing...
 		/*
 		 * XXX - GRP - Is the next line right? If I've inserted
 		 * text the buffer has been updated but not written. Will
 		 * netbeans guarantee to write it? Even if I do a :q! ?
 		 */
-		curbuf->b_changed = old_b_changed; /* logically unchanged */
+		curbuf->b_changed = old_b_changed; // logically unchanged
 		netbeansFireChanges = oldFire;
-		/* Undo info is invalid now... */
+		// Undo info is invalid now...
 		u_blockfree(curbuf);
 		u_clearall(curbuf);
 	    }
 	    vim_free(to_free);
-	    nb_reply_nil(cmdno); /* or !error */
+	    nb_reply_nil(cmdno); // or !error
 	}
 	else
 	{
 	    nbdebug(("UNIMPLEMENTED FUNCTION: %s\n", cmd));
 	    nb_reply_nil(cmdno);
 	    retval = FAIL;
 	}
 }
-else /* Not a function; no reply required. */
+else // Not a function; no reply required.
 {
-/* =====================================================================*/
+// =====================================================================
 	if (streq((char *)cmd, "create"))
 	{
-	    /* Create a buffer without a name. */
+	    // Create a buffer without a name.
 	    if (buf == NULL)
 	    {
 		nbdebug(("    invalid buffer identifier in create\n"));
 		emsg("E636: invalid buffer identifier in create");
 		return FAIL;
 	    }
 	    VIM_CLEAR(buf->displayname);
-	    netbeansReadFile = 0; /* don't try to open disk file */
+	    netbeansReadFile = 0; // don't try to open disk file
 	    do_ecmd(0, NULL, 0, 0, ECMD_ONE, ECMD_HIDE + ECMD_OLDBUF, curwin);
 	    netbeansReadFile = 1;
 	    buf->bufp = curbuf;
 	    maketitle();
 	    buf->insertDone = FALSE;
 #if defined(FEAT_MENU) && defined(FEAT_GUI)
 	    if (gui.in_use)
 		gui_update_menus(0);
 #endif
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "insertDone"))
 	{
 	    if (buf == NULL || buf->bufp == NULL)
 	    {
 		buf->insertDone = TRUE;
 		args += 2;
 		buf->bufp->b_p_ro = *args == 'T';
 		print_read_msg(buf);
 	    }
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "saveDone"))
 	{
 	    long savedChars = atol((char *)args);
 	    if (buf == NULL || buf->bufp == NULL)
 		nbdebug(("    invalid buffer identifier in saveDone\n"));
 	    else
 		print_save_msg(buf, savedChars);
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "startDocumentListen"))
 	{
 	    if (buf == NULL)
 	    {
 		nbdebug(("    invalid buffer identifier in startDocumentListen\n"));
 		emsg("E637: invalid buffer identifier in startDocumentListen");
 		return FAIL;
 	    }
 	    buf->fireChanges = 1;
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "stopDocumentListen"))
 	{
 	    if (buf == NULL)
 	    {
 		    semsg(_("E658: NetBeans connection lost for buffer %d"),
 							   buf->bufp->b_fnum);
 		}
 		else
 		{
-		    /* NetBeans uses stopDocumentListen when it stops editing
+		    // NetBeans uses stopDocumentListen when it stops editing
-		     * a file.  It then expects the buffer in Vim to
+		    // a file.  It then expects the buffer in Vim to
-		     * disappear. */
+		    // disappear.
 		    do_bufdel(DOBUF_DEL, (char_u *)"", 1,
 				  buf->bufp->b_fnum, buf->bufp->b_fnum, TRUE);
 		    vim_memset(buf, 0, sizeof(nbbuf_T));
 		}
 	    }
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "setTitle"))
 	{
 	    if (buf == NULL)
 	    {
 		emsg("E639: invalid buffer identifier in setTitle");
 		return FAIL;
 	    }
 	    vim_free(buf->displayname);
 	    buf->displayname = nb_unquote(args, NULL);
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "initDone"))
 	{
 	    if (buf == NULL || buf->bufp == NULL)
 	    {
 	    do_update = 1;
 	    buf->initDone = TRUE;
 	    nb_set_curbuf(buf->bufp);
 	    apply_autocmds(EVENT_BUFREADPOST, 0, 0, FALSE, buf->bufp);
-	    /* handle any postponed key commands */
+	    // handle any postponed key commands
 	    handle_key_queue();
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "setBufferNumber")
 		|| streq((char *)cmd, "putBufferNumber"))
 	{
 	    char_u	*path;
 		return FAIL;
 	    }
 	    buf->bufp = bufp;
 	    buf->nbbuf_number = bufp->b_fnum;
-	    /* "setBufferNumber" has the side effect of jumping to the buffer
+	    // "setBufferNumber" has the side effect of jumping to the buffer
-	     * (don't know why!).  Don't do that for "putBufferNumber". */
+	    // (don't know why!).  Don't do that for "putBufferNumber".
 	    if (*cmd != 'p')
 		coloncmd(":buffer %d", bufp->b_fnum);
 	    else
 	    {
 		buf->initDone = TRUE;
-		/* handle any postponed key commands */
+		// handle any postponed key commands
 		handle_key_queue();
 	    }
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "setFullName"))
 	{
 	    if (buf == NULL)
 	    {
 		return FAIL;
 	    }
 	    vim_free(buf->displayname);
 	    buf->displayname = nb_unquote(args, NULL);
-	    netbeansReadFile = 0; /* don't try to open disk file */
+	    netbeansReadFile = 0; // don't try to open disk file
 	    do_ecmd(0, (char_u *)buf->displayname, 0, 0, ECMD_ONE,
 					     ECMD_HIDE + ECMD_OLDBUF, curwin);
 	    netbeansReadFile = 1;
 	    buf->bufp = curbuf;
 	    maketitle();
 #if defined(FEAT_MENU) && defined(FEAT_GUI)
 	    if (gui.in_use)
 		gui_update_menus(0);
 #endif
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "editFile"))
 	{
 	    if (buf == NULL)
 	    {
 		nbdebug(("    invalid buffer identifier in editFile\n"));
 		emsg("E644: invalid buffer identifier in editFile");
 		return FAIL;
 	    }
-	    /* Edit a file: like create + setFullName + read the file. */
+	    // Edit a file: like create + setFullName + read the file.
 	    vim_free(buf->displayname);
 	    buf->displayname = nb_unquote(args, NULL);
 	    do_ecmd(0, (char_u *)buf->displayname, NULL, NULL, ECMD_ONE,
 					     ECMD_HIDE + ECMD_OLDBUF, curwin);
 	    buf->bufp = curbuf;
 #endif
 #if defined(FEAT_MENU) && defined(FEAT_GUI)
 	    if (gui.in_use)
 		gui_update_menus(0);
 #endif
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "setVisible"))
 	{
 	    if (buf == NULL || buf->bufp == NULL)
 	    {
 		nbdebug(("    invalid buffer identifier in setVisible\n"));
-		/* This message was commented out, probably because it can
+		// This message was commented out, probably because it can
-		 * happen when shutting down. */
+		// happen when shutting down.
 		if (p_verbose > 0)
 		    emsg("E645: invalid buffer identifier in setVisible");
 		return FAIL;
 	    }
 	    if (streq((char *)args, "T") && buf->bufp != curbuf)
 		goto_buffer(&exarg, DOBUF_FIRST, FORWARD, buf->bufp->b_fnum);
 		do_update = 1;
 		dosetvisible = FALSE;
 #ifdef FEAT_GUI
-		/* Side effect!!!. */
+		// Side effect!!!.
 		if (gui.in_use)
 		    gui_mch_set_foreground();
 #endif
 	    }
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "raise"))
 	{
 #ifdef FEAT_GUI
-	    /* Bring gvim to the foreground. */
+	    // Bring gvim to the foreground.
 	    if (gui.in_use)
 		gui_mch_set_foreground();
 #endif
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "setModified"))
 	{
 	    int prev_b_changed;
 	    if (buf == NULL || buf->bufp == NULL)
 	    {
 		nbdebug(("    invalid buffer identifier in setModified\n"));
-		/* This message was commented out, probably because it can
+		// This message was commented out, probably because it can
-		 * happen when shutting down. */
+		// happen when shutting down.
 		if (p_verbose > 0)
 		    emsg("E646: invalid buffer identifier in setModified");
 		return FAIL;
 	    }
 	    prev_b_changed = buf->bufp->b_changed;
 		buf->bufp->b_changed = TRUE;
 	    else
 	    {
 		stat_T	st;
-		/* Assume NetBeans stored the file.  Reset the timestamp to
+		// Assume NetBeans stored the file.  Reset the timestamp to
-		 * avoid "file changed" warnings. */
+		// avoid "file changed" warnings.
 		if (buf->bufp->b_ffname != NULL
 			&& mch_stat((char *)buf->bufp->b_ffname, &st) >= 0)
 		    buf_store_time(buf->bufp, &st, buf->bufp->b_ffname);
 		buf->bufp->b_changed = FALSE;
 	    }
 #ifdef FEAT_TITLE
 		maketitle();
 #endif
 		update_screen(0);
 	    }
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "setModtime"))
 	{
 	    if (buf == NULL || buf->bufp == NULL)
 		nbdebug(("    invalid buffer identifier in setModtime\n"));
 	    else
 		buf->bufp->b_mtime = atoi((char *)args);
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "setReadOnly"))
 	{
 	    if (buf == NULL || buf->bufp == NULL)
 		nbdebug(("    invalid buffer identifier in setReadOnly\n"));
 	    else if (streq((char *)args, "T"))
 		buf->bufp->b_p_ro = TRUE;
 	    else
 		buf->bufp->b_p_ro = FALSE;
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "setMark"))
 	{
-	    /* not yet */
+	    // not yet
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "showBalloon"))
 	{
 #if defined(FEAT_BEVAL_GUI)
 	    static char	*text = NULL;
 		text = nb_unquote(args, NULL);
 		if (text != NULL)
 		    gui_mch_post_balloon(balloonEval, (char_u *)text);
 	    }
 #endif
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "setDot"))
 	{
 	    pos_T *pos;
 #ifdef NBDEBUG
 		return FAIL;
 	    }
 	    nb_set_curbuf(buf->bufp);
-	    /* Don't want Visual mode now. */
+	    // Don't want Visual mode now.
 	    if (VIsual_active)
 		end_visual_mode();
 #ifdef NBDEBUG
 	    s = args;
 #endif
 	    else
 	    {
 		nbdebug(("    BAD POSITION in setDot: %s\n", s));
 	    }
-	    /* gui_update_cursor(TRUE, FALSE); */
+	    // gui_update_cursor(TRUE, FALSE);
-	    /* update_curbuf(NOT_VALID); */
+	    // update_curbuf(NOT_VALID);
-	    update_topline();		/* scroll to show the line */
+	    update_topline();		// scroll to show the line
 	    update_screen(VALID);
 	    setcursor();
 	    cursor_on();
 	    out_flush_cursor(TRUE, FALSE);
-	    /* Quit a hit-return or more prompt. */
+	    // Quit a hit-return or more prompt.
 	    if (State == HITRETURN || State == ASKMORE)
 	    {
 #ifdef FEAT_GUI_GTK
 		if (gui.in_use && gtk_main_level() > 0)
 		    gtk_main_quit();
 #endif
 	    }
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "close"))
 	{
 #ifdef NBDEBUG
 	    char *name = "<NONE>";
 		name = buf->displayname;
 #endif
 	    if (buf->bufp == NULL)
 	    {
 		nbdebug(("    invalid buffer identifier in close\n"));
-		/* This message was commented out, probably because it can
+		// This message was commented out, probably because it can
-		 * happen when shutting down. */
+		// happen when shutting down.
 		if (p_verbose > 0)
 		    emsg("E649: invalid buffer identifier in close");
 	    }
 	    nbdebug(("    CLOSE %d: %s\n", bufno, name));
 #ifdef FEAT_GUI
 		do_buffer(DOBUF_WIPE, DOBUF_FIRST, FORWARD,
 						     buf->bufp->b_fnum, TRUE);
 	    buf->bufp = NULL;
 	    buf->initDone = FALSE;
 	    do_update = 1;
-/* =====================================================================*/
+// =====================================================================
 	}
-	else if (streq((char *)cmd, "setStyle")) /* obsolete... */
+	else if (streq((char *)cmd, "setStyle")) // obsolete...
 	{
 	    nbdebug(("    setStyle is obsolete!\n"));
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "setExitDelay"))
 	{
-	    /* Only used in version 2.1. */
+	    // Only used in version 2.1.
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "defineAnnoType"))
 	{
 #ifdef FEAT_SIGNS
 	    int typeNum;
 	    else if (typeName != NULL && tooltip != NULL && glyphFile != NULL)
 		addsigntype(buf, typeNum, typeName, tooltip, glyphFile, fg, bg);
 	    else
 		vim_free(typeName);
-	    /* don't free typeName; it's used directly in addsigntype() */
+	    // don't free typeName; it's used directly in addsigntype()
 	    vim_free(fg);
 	    vim_free(bg);
 	    vim_free(tooltip);
 	    vim_free(glyphFile);
 	    if (parse_error)
 		return FAIL;
 #endif
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "addAnno"))
 	{
 #ifdef FEAT_SIGNS
 	    int serNum;
 	    do_update = 1;
 	    cp = (char *)args;
 	    serNum = strtol(cp, &cp, 10);
-	    /* Get the typenr specific for this buffer and convert it to
+	    // Get the typenr specific for this buffer and convert it to
-	     * the global typenumber, as used for the sign name. */
+	    // the global typenumber, as used for the sign name.
 	    localTypeNum = strtol(cp, &cp, 10);
 	    args = (char_u *)cp;
 	    typeNum = mapsigntype(buf, localTypeNum);
 	    pos = get_off_or_lnum(buf->bufp, &args);
 		if (typeNum == curPCtype)
 		    coloncmd(":sign jump %d buffer=%d", serNum,
 						       buf->bufp->b_fnum);
 	    }
 #endif
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "removeAnno"))
 	{
 #ifdef FEAT_SIGNS
 	    int serNum;
 	    args = (char_u *)cp;
 	    coloncmd(":sign unplace %d buffer=%d",
 		     serNum, buf->bufp->b_fnum);
 	    redraw_buf_later(buf->bufp, NOT_VALID);
 #endif
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "moveAnnoToFront"))
 	{
 #ifdef FEAT_SIGNS
 	    nbdebug(("    moveAnnoToFront: Not Yet Implemented!\n"));
 #endif
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "guard") || streq((char *)cmd, "unguard"))
 	{
 	    int len;
 	    pos_T first;
 			    cmd, off + len - 1));
 		else
 		{
 		    long lnum;
 		    last = *pos;
-		    /* set highlight for region */
+		    // set highlight for region
 		    nbdebug(("    %sGUARD %ld,%d to %ld,%d\n", (un) ? "UN" : "",
 			     first.lnum, first.col,
 			     last.lnum, last.col));
 #ifdef FEAT_SIGNS
 		    for (lnum = first.lnum; lnum <= last.lnum; lnum++)
 		    {
 			if (un)
 			{
-			    /* never used */
+			    // never used
 			}
 			else
 			{
 			    if (buf_findsigntype_id(buf->bufp, lnum,
 				GUARDED) == 0)
 		    }
 #endif
 		    redraw_buf_later(buf->bufp, NOT_VALID);
 		}
 	    }
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "startAtomic"))
 	{
 	    inAtomic = 1;
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "endAtomic"))
 	{
 	    inAtomic = 0;
 	    if (needupdate)
 	    {
 		do_update = 1;
 		needupdate = 0;
 	    }
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "save"))
 	{
 	    /*
 	     * NOTE - This command is obsolete wrt NetBeans. It's left in
 	    {
 		nbdebug(("    invalid buffer identifier in %s command\n", cmd));
 		return FAIL;
 	    }
-	    /* the following is taken from ex_cmds.c (do_wqall function) */
+	    // the following is taken from ex_cmds.c (do_wqall function)
 	    if (bufIsChanged(buf->bufp))
 	    {
-		/* Only write if the buffer can be written. */
+		// Only write if the buffer can be written.
 		if (p_write
 			&& !buf->bufp->b_p_ro
 			&& buf->bufp->b_ffname != NULL
 #ifdef FEAT_QUICKFIX
 			&& !bt_dontwrite(buf->bufp)
 		{
 		    bufref_T bufref;
 		    set_bufref(&bufref, buf->bufp);
 		    buf_write_all(buf->bufp, FALSE);
-		    /* an autocommand may have deleted the buffer */
+		    // an autocommand may have deleted the buffer
 		    if (!bufref_valid(&bufref))
 			buf->bufp = NULL;
 		}
 	    }
 	    else
 	    {
 		nbdebug(("    Buffer has no changes!\n"));
 	    }
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "netbeansBuffer"))
 	{
 	    if (buf == NULL || buf->bufp == NULL)
 	    {
 		buf->bufp->b_netbeans_file = TRUE;
 		buf->bufp->b_was_netbeans_file = TRUE;
 	    }
 	    else
 		buf->bufp->b_netbeans_file = FALSE;
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "specialKeys"))
 	{
 	    special_keys(args);
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "actionMenuItem"))
 	{
-	    /* not used yet */
+	    // not used yet
-/* =====================================================================*/
+// =====================================================================
 	}
 	else if (streq((char *)cmd, "version"))
 	{
-	    /* not used yet */
+	    // not used yet
 	}
 	else
 	{
 	    nbdebug(("Unrecognised command: %s\n", cmd));
 	}
 	update_screen(NOT_VALID);
 	setcursor();
 	cursor_on();
 	out_flush_cursor(TRUE, FALSE);
-	/* Quit a hit-return or more prompt. */
+	// Quit a hit-return or more prompt.
 	if (State == HITRETURN || State == ASKMORE)
 	{
 #ifdef FEAT_GUI_GTK
 	    if (gui.in_use && gtk_main_level() > 0)
 		gtk_main_quit();
 nbdebug(("    COLONCMD %s\n", buf));
 do_cmdline((char_u *)buf, NULL, NULL, DOCMD_NOWAIT | DOCMD_KEYTYPED);
-setcursor();		/* restore the cursor position */
+setcursor();		// restore the cursor position
 out_flush_cursor(TRUE, FALSE);
 }
 /*
 	case K_F12:		name = "F12";		break;
 	case K_S_F12:	name = "F12";	shift = 1;	break;
 	default:
 			if (key >= ' ' && key <= '~')
 			{
-			    /* Allow ASCII characters. */
+			    // Allow ASCII characters.
 			    name = namebuf;
 			    namebuf[0] = key;
 			    namebuf[1] = NUL;
 			}
 			else
 if (ctrl)
 	strcat(buf, "C");
 if (shift)
 	strcat(buf, "S");
 if (alt)
-	strcat(buf, "M"); /* META */
+	strcat(buf, "M"); // META
 if (ctrl || shift || alt)
 	strcat(buf, "-");
 strcat(buf, name);
 }
 linenr_T	lnum;
 int		col;
 char	*buf;
 char_u	*p;
-/* Don't do anything when 'ballooneval' is off, messages scrolled the
+// Don't do anything when 'ballooneval' is off, messages scrolled the
-* windows up or we have no connection. */
+// windows up or we have no connection.
 if (!can_use_beval() || !NETBEANS_OPEN)
 	return;
 if (get_beval_info(beval, TRUE, &wp, &lnum, &text, &col) == OK)
 {
-	/* Send debugger request.  Only when the text is of reasonable
+	// Send debugger request.  Only when the text is of reasonable
-	 * length. */
+	// length.
 	if (text != NULL && text[0] != NUL && STRLEN(text) < MAXPATHL)
 	{
 	    buf = alloc(MAXPATHL * 2 + 25);
 	    if (buf != NULL)
 	    {
 	return;
 nbdebug(("EVT: %s", cmd));
 nb_send(cmd, "netbeans_startup_done");
-/* update the screen after having added the gutter */
+// update the screen after having added the gutter
 changed_window_setting();
 update_screen(CLEAR);
 setcursor();
 cursor_on();
 out_flush_cursor(TRUE, FALSE);
 if (!NETBEANS_OPEN)
 	return;
 sprintf(buf, "0:geometry=%d %d %d %d %d\n",
 		    r_cmdno, (int)Columns, (int)Rows, new_x, new_y);
-/*nbdebug(("EVT: %s", buf)); happens too many times during a move */
+// nbdebug(("EVT: %s", buf)); happens too many times during a move
 nb_send(buf, "netbeans_frame_moved");
 }
 #endif
 /*
 vim_snprintf(buffer, sizeof(buffer),  "%d:fileOpened=%d \"%s\" %s %s\n",
 	    bufno,
 	    bufno,
 	    (char *)q,
-	    "T",  /* open in NetBeans */
+	    "T",  // open in NetBeans
-	    "F"); /* modified */
+	    "F"); // modified
 vim_free(q);
 nbdebug(("EVT: %s", buffer));
 nb_send(buffer, "netbeans_file_opened");
 vim_snprintf(buffer, sizeof(buffer), "%d:fileOpened=%d \"%s\" %s %s\n",
 	    bnum,
 	    0,
 	    (char *)q,
-	    "T",  /* open in NetBeans */
+	    "T",  // open in NetBeans
-	    "F"); /* modified */
+	    "F"); // modified
 vim_free(q);
 nbdebug(("EVT: %s", buffer));
 nb_send(buffer, "netbeans_file_opened");
 {
 int		bufno;
 nbbuf_T	*nbbuf;
 if (!NETBEANS_OPEN || !netbeansFireChanges)
-	return NULL;		/* changes are not reported at all */
+	return NULL;		// changes are not reported at all
 bufno = nb_getbufno(bufp);
 if (bufno <= 0)
-	return NULL;		/* file is not known to NetBeans */
+	return NULL;		// file is not known to NetBeans
 nbbuf = nb_get_buf(bufno);
 if (nbbuf != NULL && !nbbuf->fireChanges)
-	return NULL;		/* changes in this buffer are not reported */
+	return NULL;		// changes in this buffer are not reported
 *bufnop = bufno;
 return nbbuf;
 }
 nbbuf = nb_bufp2nbbuf_fire(bufp, &bufno);
 if (nbbuf == NULL)
 	return;
-/* Don't mark as modified for initial read */
+// Don't mark as modified for initial read
 if (nbbuf->insertDone)
 	nbbuf->modified = 1;
 pos.lnum = linenr;
 pos.col = col;
 off = pos2off(bufp, &pos);
-/* send the "insert" EVT */
+// send the "insert" EVT
 newtxt = alloc(newlen + 1);
 vim_strncpy(newtxt, txt, newlen);
 p = nb_quote(newtxt);
 if (p != NULL)
 {
 * Send netbeans an unmodified command.
 */
 void
 netbeans_unmodified(buf_T *bufp UNUSED)
 {
-/* This is a no-op, because NetBeans considers a buffer modified
+// This is a no-op, because NetBeans considers a buffer modified
-* even when all changes have been undone. */
+// even when all changes have been undone.
 }
 /*
 * Send a button release event back to netbeans. It's up to netbeans
 * to decide what to do (if anything) with this event.
 {
 	int col = mouse_col - curwin->w_wincol
 			      - ((curwin->w_p_nu || curwin->w_p_rnu) ? 9 : 1);
 	long off = pos2off(curbuf, &curwin->w_cursor);
-	/* sync the cursor position */
+	// sync the cursor position
 	sprintf(buf, "%d:newDotAndMark=%d %ld %ld\n", bufno, r_cmdno, off, off);
 	nbdebug(("EVT: %s", buf));
 	nb_send(buf, "netbeans_button_release[newDotAndMark]");
 	sprintf(buf, "%d:buttonRelease=%d %d %ld %d\n", bufno, r_cmdno,
 						 : nb_quote(curbuf->b_ffname);
 	if (q == NULL)
 	    return TRUE;
 	vim_snprintf(buf, sizeof(buf), "0:fileOpened=%d \"%s\" %s %s\n", 0,
 		q,
-		"T",  /* open in NetBeans */
+		"T",  // open in NetBeans
-		"F"); /* modified */
+		"F"); // modified
 	if (curbuf->b_ffname != NULL)
 	    vim_free(q);
 	nbdebug(("EVT: %s", buf));
 	nb_send(buf, "netbeans_keycommand");
 	postpone_keycommand(keyName);
 	return FALSE;
 }
-/* sync the cursor position */
+// sync the cursor position
 off = pos2off(curbuf, &curwin->w_cursor);
 sprintf(buf, "%d:newDotAndMark=%d %ld %ld\n", bufno, r_cmdno, off, off);
 nbdebug(("EVT: %s", buf));
 nb_send(buf, "netbeans_keycommand");
-/* To work on Win32 you must apply patch to ExtEditor module
+// To work on Win32 you must apply patch to ExtEditor module
-* from ExtEdCaret.java.diff - make EVT_newDotAndMark handler
+// from ExtEdCaret.java.diff - make EVT_newDotAndMark handler
-* more synchronous
+// more synchronous
-*/
+// now send keyCommand event
-/* now send keyCommand event */
 vim_snprintf(buf, sizeof(buf), "%d:keyCommand=%d \"%s\"\n",
 						     bufno, r_cmdno, keyName);
 nbdebug(("EVT: %s", buf));
 nb_send(buf, "netbeans_keycommand");
-/* New: do both at once and include the lnum/col. */
+// New: do both at once and include the lnum/col.
 vim_snprintf(buf, sizeof(buf), "%d:keyAtPos=%d \"%s\" %ld %ld/%ld\n",
 	    bufno, r_cmdno, keyName,
 		off, (long)curwin->w_cursor.lnum, (long)curwin->w_cursor.col);
 nbdebug(("EVT: %s", buf));
 nb_send(buf, "netbeans_keycommand");
 nbbuf = nb_bufp2nbbuf_fire(bufp, &bufno);
 if (nbbuf == NULL)
 	return;
-/* Don't mark as modified for initial read */
+// Don't mark as modified for initial read
 if (nbbuf->insertDone)
 	nbbuf->modified = 1;
 sprintf((char *)buf, "%d:remove=%d 0 -1\n", bufno, r_cmdno);
 nbdebug(("EVT(suppressed): %s", buf));
-/*     nb_send(buf, "netbeans_deleted_all_lines"); */
+//     nb_send(buf, "netbeans_deleted_all_lines");
 }
 /*
 * See if the lines are guarded. The top and bot parameters are from
 XDrawPoint(gui.dpy, gui.wid, gui.text_gc, x+1, y);
 XDrawPoint(gui.dpy, gui.wid, gui.text_gc, x+2, y);
 XDrawPoint(gui.dpy, gui.wid, gui.text_gc, x+3, y++);
 XDrawPoint(gui.dpy, gui.wid, gui.text_gc, x+2, y);
 }
-#endif /* FEAT_GUI_X11 */
+#endif // FEAT_GUI_X11
 #if defined(FEAT_GUI_GTK) && !defined(PROTO)
 /*
 * We have multiple signs to draw at the same location. Draw the
 * multi-sign indicator instead. This is the GTK/Gnome version.
 #if GTK_CHECK_VERSION(3,0,0)
 cairo_destroy(cr);
 #endif
 }
-#endif /* FEAT_GUI_GTK */
+#endif // FEAT_GUI_GTK
 /*
 * If the mouse is clicked in the gutter of a line with multiple
 * annotations, cycle through the set of signs.
 */
 {
 	if (p->se_lnum == lnum && p->se_next && p->se_next->se_lnum == lnum)
 	{
 	    sign_entry_T *tail;
-	    /* remove "p" from list, reinsert it at the tail of the sublist */
+	    // remove "p" from list, reinsert it at the tail of the sublist
 	    if (p->se_prev)
 		p->se_prev->se_next = p->se_next;
 	    else
 		curbuf->b_signlist = p->se_next;
 	    p->se_next->se_prev = p->se_prev;
-	    /* now find end of sublist and insert p */
+	    // now find end of sublist and insert p
 	    for (tail = p->se_next;
 		  tail->se_next && tail->se_next->se_lnum == lnum
 				       && tail->se_next->se_id < GUARDEDOFFSET;
 		  tail = tail->se_next)
 		;
-	    /* tail now points to last entry with same lnum (except
+	    // tail now points to last entry with same lnum (except
-	     * that "guarded" annotations are always last) */
+	    // that "guarded" annotations are always last)
 	    p->se_next = tail->se_next;
 	    if (tail->se_next)
 		tail->se_next->se_prev = p;
 	    p->se_prev = tail;
 	    tail->se_next = p;
 for (i = 0; i < globalsignmapused; i++)
 	if (STRCMP(typeName, globalsignmap[i]) == 0)
 	    break;
-if (i == globalsignmapused) /* not found; add it to global map */
+if (i == globalsignmapused) // not found; add it to global map
 {
 	nbdebug(("DEFINEANNOTYPE(%d,%s,%s,%s,%s,%s)\n",
 			    typeNum, typeName, tooltip, glyphFile, fg, bg));
 	if (use_fg || use_bg)
 	{
 		sprintf(bgbuf, "guibg=%s ctermbg=%s", bg, bg);
 	    coloncmd(":highlight NB_%s %s %s", typeName, (use_fg) ? fgbuf : "",
 		     (use_bg) ? bgbuf : "");
 	    if (*glyphFile == NUL)
-		/* no glyph, line highlighting only */
+		// no glyph, line highlighting only
 		coloncmd(":sign define %d linehl=NB_%s", i + 1, typeName);
 	    else if (vim_strsize(glyphFile) <= 2)
-		/* one- or two-character glyph name, use as text glyph with
+		// one- or two-character glyph name, use as text glyph with
-		 * texthl */
+		// texthl
 		coloncmd(":sign define %d text=%s texthl=NB_%s", i + 1,
 							 glyphFile, typeName);
 	    else
-		/* glyph, line highlighting */
+		// glyph, line highlighting
 		coloncmd(":sign define %d icon=%s linehl=NB_%s", i + 1,
 							 glyphFile, typeName);
 	}
 	else
-	    /* glyph, no line highlighting */
+	    // glyph, no line highlighting
 	    coloncmd(":sign define %d icon=%s", i + 1, glyphFile);
 	if (STRCMP(typeName,"CurrentPC") == 0)
 	    curPCtype = typeNum;
 	if (globalsignmapused == globalsignmaplen)
 	{
-	    if (globalsignmaplen == 0) /* first allocation */
+	    if (globalsignmaplen == 0) // first allocation
 	    {
 		globalsignmaplen = 20;
 		globalsignmap = ALLOC_CLEAR_MULT(char *, globalsignmaplen);
 	    }
-	    else    /* grow it */
+	    else    // grow it
 	    {
 		int incr;
 		int oldlen = globalsignmaplen;
 		char **t_globalsignmap = globalsignmap;
 	globalsignmap[i] = (char *)typeName;
 	globalsignmapused = i + 1;
 }
-/* check local map; should *not* be found! */
+// check local map; should *not* be found!
 for (j = 0; j < buf->signmapused; j++)
 	if (buf->signmap[j] == i + 1)
 	    return;
-/* add to local map */
+// add to local map
 if (buf->signmapused == buf->signmaplen)
 {
-	if (buf->signmaplen == 0) /* first allocation */
+	if (buf->signmaplen == 0) // first allocation
 	{
 	    buf->signmaplen = 5;
 	    buf->signmap = ALLOC_CLEAR_MULT(int, buf->signmaplen);
 	}
-	else    /* grow it */
+	else    // grow it
 	{
 	    int incr;
 	    int oldlen = buf->signmaplen;
 	    int *t_signmap = buf->signmap;
 	    eol_size = 1;
 	for (lnum = 1; lnum <= bufp->b_ml.ml_line_count; ++lnum)
 	{
 	    char_count += (long)STRLEN(ml_get_buf(bufp, lnum, FALSE))
 								   + eol_size;
-	    /* Check for a CTRL-C every 100000 characters */
+	    // Check for a CTRL-C every 100000 characters
 	    if (char_count > last_check)
 	    {
 		ui_breakcheck();
 		if (got_int)
 		    return char_count;
 		last_check = char_count + 100000L;
 	    }
 	}
-	/* Correction for when last line doesn't have an EOL. */
+	// Correction for when last line doesn't have an EOL.
 	if (!bufp->b_p_eol && (bufp->b_p_bin || !bufp->b_p_fixeol))
 	    char_count -= eol_size;
 }
 return char_count;
 					       : _("[Incomplete last line]"));
 	c = TRUE;
 }
 msg_add_lines(c, (long)lnum, nchars);
-/* Now display it */
+// Now display it
 VIM_CLEAR(keep_msg);
 msg_scrolled_ign = TRUE;
 msg_trunc_attr((char *)IObuff, FALSE, 0);
 msg_scrolled_ign = FALSE;
 }
 char_u	c;
 char_u	*p;
 if (nchars >= 0)
 {
-	/* put fname in IObuff with quotes */
+	// put fname in IObuff with quotes
 	msg_add_fname(buf->bufp, buf->bufp->b_ffname);
 	c = FALSE;
 	msg_add_lines(c, buf->bufp->b_ml.ml_line_count,
 						buf->bufp->b_orig_size);
 	VIM_CLEAR(keep_msg);
 	msg_scrolled_ign = TRUE;
 	p = (char_u *)msg_trunc_attr((char *)IObuff, FALSE, 0);
 	if ((msg_scrolled && !need_wait_return) || !buf->initDone)
 	{
-	    /* Need to repeat the message after redrawing when:
+	    // Need to repeat the message after redrawing when:
-	     * - When reading from stdin (the screen will be cleared next).
+	    // - When reading from stdin (the screen will be cleared next).
-	     * - When restart_edit is set (otherwise there will be a delay
+	    // - When restart_edit is set (otherwise there will be a delay
-	     *   before redrawing).
+	    //   before redrawing).
-	     * - When the screen was scrolled but there is no wait-return
+	    // - When the screen was scrolled but there is no wait-return
-	     *   prompt. */
+	    //   prompt.
 	    set_keep_msg(p, 0);
 	}
 	msg_scrolled_ign = FALSE;
-	/* add_to_input_buf((char_u *)"\f", 1); */
+	// add_to_input_buf((char_u *)"\f", 1);
 }
 else
 {
 	char msgbuf[IOSIZE];
 	nbdebug(("    %s\n", msgbuf));
 	emsg(msgbuf);
 }
 }
-#endif /* defined(FEAT_NETBEANS_INTG) */
+#endif // defined(FEAT_NETBEANS_INTG)

Mercurial > vim

comparison src/netbeans.c @ 18808:7982f65d8f54 v8.1.2392