|
Lines 78-84
Link Here
|
| 78 |
} |
78 |
} |
| 79 |
|
79 |
|
| 80 |
protected void addAttributeValueProposals(ContentAssistRequest contentAssistRequest) { |
80 |
protected void addAttributeValueProposals(ContentAssistRequest contentAssistRequest) { |
| 81 |
addTemplates(contentAssistRequest, TemplateContextTypeIdsHTML.ATTRIBUTE_VALUE); |
81 |
// bug115927 do not include first quote |
|
|
82 |
int startOffset = contentAssistRequest.getReplacementBeginPosition(); |
| 83 |
if (contentAssistRequest.getMatchString().length() > 0 && (contentAssistRequest.getMatchString().charAt(0) == '\'' || contentAssistRequest.getMatchString().charAt(0) == '"')) { |
| 84 |
++startOffset; |
| 85 |
} |
| 86 |
addTemplates(contentAssistRequest, TemplateContextTypeIdsHTML.ATTRIBUTE_VALUE, startOffset); |
| 82 |
super.addAttributeValueProposals(contentAssistRequest); |
87 |
super.addAttributeValueProposals(contentAssistRequest); |
| 83 |
} |
88 |
} |
| 84 |
|
89 |
|
|
Lines 119-127
Link Here
|
| 119 |
* @param context |
124 |
* @param context |
| 120 |
*/ |
125 |
*/ |
| 121 |
private void addTemplates(ContentAssistRequest contentAssistRequest, String context) { |
126 |
private void addTemplates(ContentAssistRequest contentAssistRequest, String context) { |
|
|
127 |
addTemplates(contentAssistRequest, context, contentAssistRequest.getReplacementBeginPosition()); |
| 128 |
} |
| 129 |
|
| 130 |
/** |
| 131 |
* Adds templates to the list of proposals |
| 132 |
* |
| 133 |
* @param contentAssistRequest |
| 134 |
* @param context |
| 135 |
* @param startOffset |
| 136 |
*/ |
| 137 |
private void addTemplates(ContentAssistRequest contentAssistRequest, String context, int startOffset) { |
| 122 |
if (contentAssistRequest == null) |
138 |
if (contentAssistRequest == null) |
| 123 |
return; |
139 |
return; |
| 124 |
|
140 |
|
| 125 |
// if already adding template proposals for a certain context type, do |
141 |
// if already adding template proposals for a certain context type, do |
| 126 |
// not add again |
142 |
// not add again |
| 127 |
if (!fTemplateContexts.contains(context)) { |
143 |
if (!fTemplateContexts.contains(context)) { |
|
Lines 130-136
Link Here
|
| 130 |
|
146 |
|
| 131 |
if (getTemplateCompletionProcessor() != null) { |
147 |
if (getTemplateCompletionProcessor() != null) { |
| 132 |
getTemplateCompletionProcessor().setContextType(context); |
148 |
getTemplateCompletionProcessor().setContextType(context); |
| 133 |
ICompletionProposal[] proposals = getTemplateCompletionProcessor().computeCompletionProposals(fTextViewer, contentAssistRequest.getReplacementBeginPosition()); |
149 |
ICompletionProposal[] proposals = getTemplateCompletionProcessor().computeCompletionProposals(fTextViewer, startOffset); |
| 134 |
for (int i = 0; i < proposals.length; ++i) { |
150 |
for (int i = 0; i < proposals.length; ++i) { |
| 135 |
if (useProposalList) |
151 |
if (useProposalList) |
| 136 |
contentAssistRequest.addProposal(proposals[i]); |
152 |
contentAssistRequest.addProposal(proposals[i]); |
|
Lines 151-157
Link Here
|
| 151 |
|
167 |
|
| 152 |
protected ContentAssistRequest computeCompletionProposals(int documentPosition, String matchString, ITextRegion completionRegion, IDOMNode treeNode, IDOMNode xmlnode) { |
168 |
protected ContentAssistRequest computeCompletionProposals(int documentPosition, String matchString, ITextRegion completionRegion, IDOMNode treeNode, IDOMNode xmlnode) { |
| 153 |
ContentAssistRequest request = super.computeCompletionProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode); |
169 |
ContentAssistRequest request = super.computeCompletionProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode); |
| 154 |
addTemplates(request, TemplateContextTypeIdsHTML.ALL); |
170 |
// bug115927 use original document position for all/any region templates |
|
|
171 |
addTemplates(request, TemplateContextTypeIdsHTML.ALL, documentPosition); |
| 155 |
return request; |
172 |
return request; |
| 156 |
} |
173 |
} |
| 157 |
|
174 |
|
