issue fixed EmptyStackException

ajayhada · Mar 20, 2012 · 86406ae · 86406ae
1 parent 2c0fc5d
commit 86406ae
Show file tree

Hide file tree

Showing 52 changed files with 5,212 additions and 14 deletions.
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/Activator.class b/RichVisualForceEditor/bin/com/vf/rich/editor/Activator.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/ColorManager.class b/RichVisualForceEditor/bin/com/vf/rich/editor/ColorManager.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/IXMLColorConstants.class b/RichVisualForceEditor/bin/com/vf/rich/editor/IXMLColorConstants.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/NonRuleBasedDamagerRepairer.class b/RichVisualForceEditor/bin/com/vf/rich/editor/NonRuleBasedDamagerRepairer.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/RichVisualForceEditor.class b/RichVisualForceEditor/bin/com/vf/rich/editor/RichVisualForceEditor.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/XMLConfiguration.class b/RichVisualForceEditor/bin/com/vf/rich/editor/XMLConfiguration.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/XMLDocumentProvider.class b/RichVisualForceEditor/bin/com/vf/rich/editor/XMLDocumentProvider.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/XMLDoubleClickStrategy.class b/RichVisualForceEditor/bin/com/vf/rich/editor/XMLDoubleClickStrategy.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/XMLWhitespaceDetector.class b/RichVisualForceEditor/bin/com/vf/rich/editor/XMLWhitespaceDetector.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/actions/ApexCodeHelpAction.class b/RichVisualForceEditor/bin/com/vf/rich/editor/actions/ApexCodeHelpAction.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/actions/DeveloperDocsHelpAction.class b/RichVisualForceEditor/bin/com/vf/rich/editor/actions/DeveloperDocsHelpAction.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/assist/Attribute.class b/RichVisualForceEditor/bin/com/vf/rich/editor/assist/Attribute.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/assist/ForceTagAssistProcessor.class b/RichVisualForceEditor/bin/com/vf/rich/editor/assist/ForceTagAssistProcessor.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/assist/HTMLFourTagDefination.class b/RichVisualForceEditor/bin/com/vf/rich/editor/assist/HTMLFourTagDefination.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/assist/Tag.class b/RichVisualForceEditor/bin/com/vf/rich/editor/assist/Tag.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/assist/TagDefinations.class b/RichVisualForceEditor/bin/com/vf/rich/editor/assist/TagDefinations.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/assist/VisualForceTagDefinition.class b/RichVisualForceEditor/bin/com/vf/rich/editor/assist/VisualForceTagDefinition.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/assist/old.tags b/RichVisualForceEditor/bin/com/vf/rich/editor/assist/old.tags
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/handlers/ContextHelpKeyHandler.class b/RichVisualForceEditor/bin/com/vf/rich/editor/handlers/ContextHelpKeyHandler.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/preferences/PreferenceConstants.class b/RichVisualForceEditor/bin/com/vf/rich/editor/preferences/PreferenceConstants.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/preferences/PreferenceInitializer.class b/RichVisualForceEditor/bin/com/vf/rich/editor/preferences/PreferenceInitializer.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/preferences/RichVisualForcePreferencePage.class b/RichVisualForceEditor/bin/com/vf/rich/editor/preferences/RichVisualForcePreferencePage.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/rules/CDataRule.class b/RichVisualForceEditor/bin/com/vf/rich/editor/rules/CDataRule.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/rules/EscapedCharRule.class b/RichVisualForceEditor/bin/com/vf/rich/editor/rules/EscapedCharRule.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/rules/NonMatchingRule.class b/RichVisualForceEditor/bin/com/vf/rich/editor/rules/NonMatchingRule.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/rules/StartTagRule.class b/RichVisualForceEditor/bin/com/vf/rich/editor/rules/StartTagRule.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/rules/TagRule.class b/RichVisualForceEditor/bin/com/vf/rich/editor/rules/TagRule.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/rules/XMLTextPredicateRule.class b/RichVisualForceEditor/bin/com/vf/rich/editor/rules/XMLTextPredicateRule.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/scanners/CDataScanner.class b/RichVisualForceEditor/bin/com/vf/rich/editor/scanners/CDataScanner.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/scanners/XMLPartitionScanner.class b/RichVisualForceEditor/bin/com/vf/rich/editor/scanners/XMLPartitionScanner.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/scanners/XMLScanner.class b/RichVisualForceEditor/bin/com/vf/rich/editor/scanners/XMLScanner.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/scanners/XMLTagScanner.class b/RichVisualForceEditor/bin/com/vf/rich/editor/scanners/XMLTagScanner.class
diff --git a/RichVisualForceEditor/bin/com/vf/rich/editor/scanners/XMLTextScanner.class b/RichVisualForceEditor/bin/com/vf/rich/editor/scanners/XMLTextScanner.class
diff --git a/RichVisualForceEditor/src/com/vf/rich/editor/assist/ForceTagAssistProcessor.java b/RichVisualForceEditor/src/com/vf/rich/editor/assist/ForceTagAssistProcessor.java
@@ -37,7 +37,7 @@ public ForceTagAssistProcessor() {
 
 	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer,
 			int documentOffset) {
-
+		//System.out.println("computeCompletionProposals -- documentOffset - " + documentOffset);
 		String text = viewer.getDocument().get().substring(0, documentOffset);
 		String[] dim = getLastWord(text);
 		String word = dim[0];
@@ -112,7 +112,7 @@ public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer,
 	}
 
 	private String[] getLastWord(String text) {
-
+		//System.out.println("getLastWord(Text) -" + text);
 		StringBuffer sb = new StringBuffer();
 		Stack stack = new Stack();
 		String word = "";
@@ -123,15 +123,14 @@ private String[] getLastWord(String text) {
 			char c = text.charAt(i);
 			if (isDelimiter(c)) {
 				str = sb.toString();
-				if (str.startsWith("<") && !str.startsWith("</")
-						&& !str.startsWith("<!")) {
+				if (str.startsWith("<") && !str.startsWith("</") && !str.startsWith("<!")) {
 					prevTag = str.substring(1);
 					if (!str.endsWith("/")) {
 						stack.push(prevTag);
 					}
 				} else if (str.startsWith("</") && stack.size() != 0) {
 					stack.pop();
-				} else if (str.endsWith("/")) {
+				} else if (str.endsWith("/") && stack.size() != 0) {
 					stack.pop();
 				}
 				sb.setLength(0);