[cdt-patch] Enable code assist when the project is indexed

["Alain Magloire" <alain@xxxxxxx>]

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/ChangeLog,v
retrieving revision 1.38
diff -u -r1.38 ChangeLog
--- ChangeLog	28 Nov 2002 23:38:42 -0000	1.38
+++ ChangeLog	1 Dec 2002 05:21:22 -0000
@@ -1,3 +1,10 @@
+2002-12-01 Alain Magloire
+
+	* src/.../internal/ui/editor/OpenOnSelectionAction.java (getText):
+	Change the label provider for the tag.
+	* src/.../internal/ui/text/CCompletionProcessor.java(evalProposals):
+	Document.getChar() is 0 based move back the position. 
+
 2002-11-28 Alain Magloire
 
 	* plugin.xml: Make a targetID for AsmEditor to allow the debug
Index: src/org/eclipse/cdt/internal/ui/editor/OpenOnSelectionAction.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenOnSelectionAction.java,v
retrieving revision 1.2
diff -u -r1.2 OpenOnSelectionAction.java
--- src/org/eclipse/cdt/internal/ui/editor/OpenOnSelectionAction.java	29 Oct 2002 21:40:58 -0000	1.2
+++ src/org/eclipse/cdt/internal/ui/editor/OpenOnSelectionAction.java	1 Dec 2002 05:21:24 -0000
@@ -76,9 +76,9 @@
 			if(element instanceof ITagEntry) {
 				ITagEntry entry = (ITagEntry) element;
 				if(entry.getIFile() != null) {
-					return entry.getIFile().getName() + " [" + entry.getLineNumber() + "] - " + entry.getIFile().getFullPath().toOSString();
+					return entry.getIFile().getName() + ":" + entry.getTagName() + ":" + entry.getLineNumber() + " - " + entry.getIFile().getFullPath().toOSString();
 				}
-				return entry.getFileName() + " [" + entry.getLineNumber() + "]";
+				return entry.getFileName() + ":" + entry.getTagName() + ":" + entry.getLineNumber();
 			} else {
 				return "";
 			}
Index: src/org/eclipse/cdt/internal/ui/text/CCompletionProcessor.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCompletionProcessor.java,v
retrieving revision 1.3
diff -u -r1.3 CCompletionProcessor.java
--- src/org/eclipse/cdt/internal/ui/text/CCompletionProcessor.java	29 Oct 2002 21:40:58 -0000	1.3
+++ src/org/eclipse/cdt/internal/ui/text/CCompletionProcessor.java	1 Dec 2002 05:21:25 -0000
@@ -258,15 +258,21 @@
 	private ICCompletionProposal[] evalProposals(IDocument document, int pos, int length) {
 		IRegion region;
 		String frag = "";
-
+	
+		// Move back the pos by one the position is 0-based
+		if (pos > 0) {
+			pos--;
+		}
+	
 		// First, check if we're on a space or trying to open a struct/union
-		if (pos > 2) {
+		if (pos > 1) {
 			try {
 				// If we're on a space and the previous character is valid text,
 				// parse the previous word.
 				if (!Character.isJavaIdentifierPart(document.getChar(pos))) {
 					pos--;
 					if (!Character.isJavaIdentifierPart(document.getChar(pos))) {
+						pos--;
 						// Comment out the dereference code, only useful once we can
 						// know variable types to go fish back structure members
 						//if (document.getChar(offset) == '.') {
@@ -278,7 +284,7 @@
 						//}
 					}
 				}
-			} catch (Exception e) {
+			} catch (BadLocationException e) {
 				return null;
 			}
 		}
@@ -288,11 +294,16 @@
 
 		// If we're currently
 		try {
-			frag = document.get(region.getOffset(), region.getLength());
-			frag = frag.trim();
-			if (frag.length() == 0)
-				// No word is selected...
+			if (region != null) {
+				frag = document.get(region.getOffset(), region.getLength());
+				frag = frag.trim();
+				// No word is selected
+				if (frag.length() == 0) {
+					return null;
+				}
+			} else {
 				return null;
+			}
 		} catch (BadLocationException x) {
 			// ignore
 			return null;