|
Lines 210-216
Link Here
|
| 210 |
* add proposals for tags in attribute values |
210 |
* add proposals for tags in attribute values |
| 211 |
*/ |
211 |
*/ |
| 212 |
protected void addAttributeValueProposals(ContentAssistRequest contentAssistRequest) { |
212 |
protected void addAttributeValueProposals(ContentAssistRequest contentAssistRequest) { |
| 213 |
addTemplates(contentAssistRequest, TemplateContextTypeIdsJSP.ATTRIBUTE_VALUE); |
213 |
// bug115927 do not include first quote |
|
|
214 |
int startOffset = contentAssistRequest.getReplacementBeginPosition(); |
| 215 |
if (contentAssistRequest.getMatchString().length() > 0 && (contentAssistRequest.getMatchString().charAt(0) == '\'' || contentAssistRequest.getMatchString().charAt(0) == '"')) { |
| 216 |
++startOffset; |
| 217 |
} |
| 218 |
addTemplates(contentAssistRequest, TemplateContextTypeIdsJSP.ATTRIBUTE_VALUE, startOffset); |
| 214 |
|
219 |
|
| 215 |
IDOMNode node = (IDOMNode) contentAssistRequest.getNode(); |
220 |
IDOMNode node = (IDOMNode) contentAssistRequest.getNode(); |
| 216 |
|
221 |
|
|
Lines 1145-1151
Link Here
|
| 1145 |
} |
1150 |
} |
| 1146 |
} |
1151 |
} |
| 1147 |
|
1152 |
|
| 1148 |
addTemplates(request, TemplateContextTypeIdsJSP.ALL); |
1153 |
// bug115927 use original document position for all/any region templates |
|
|
1154 |
addTemplates(request, TemplateContextTypeIdsJSP.ALL, documentPosition); |
| 1149 |
return request; |
1155 |
return request; |
| 1150 |
} |
1156 |
} |
| 1151 |
|
1157 |
|
|
Lines 1163-1168
Link Here
|
| 1163 |
* @param context |
1169 |
* @param context |
| 1164 |
*/ |
1170 |
*/ |
| 1165 |
private void addTemplates(ContentAssistRequest contentAssistRequest, String context) { |
1171 |
private void addTemplates(ContentAssistRequest contentAssistRequest, String context) { |
|
|
1172 |
addTemplates(contentAssistRequest, context, contentAssistRequest.getReplacementBeginPosition()); |
| 1173 |
} |
| 1174 |
|
| 1175 |
/** |
| 1176 |
* Adds templates to the list of proposals |
| 1177 |
* |
| 1178 |
* @param contentAssistRequest |
| 1179 |
* @param context |
| 1180 |
* @param startOffset |
| 1181 |
*/ |
| 1182 |
private void addTemplates(ContentAssistRequest contentAssistRequest, String context, int startOffset) { |
| 1166 |
if (contentAssistRequest == null) |
1183 |
if (contentAssistRequest == null) |
| 1167 |
return; |
1184 |
return; |
| 1168 |
|
1185 |
|
|
Lines 1174-1180
Link Here
|
| 1174 |
|
1191 |
|
| 1175 |
if (getTemplateCompletionProcessor() != null) { |
1192 |
if (getTemplateCompletionProcessor() != null) { |
| 1176 |
getTemplateCompletionProcessor().setContextType(context); |
1193 |
getTemplateCompletionProcessor().setContextType(context); |
| 1177 |
ICompletionProposal[] proposals = getTemplateCompletionProcessor().computeCompletionProposals(fTextViewer, contentAssistRequest.getReplacementBeginPosition()); |
1194 |
ICompletionProposal[] proposals = getTemplateCompletionProcessor().computeCompletionProposals(fTextViewer, startOffset); |
| 1178 |
for (int i = 0; i < proposals.length; ++i) { |
1195 |
for (int i = 0; i < proposals.length; ++i) { |
| 1179 |
if (useProposalList) |
1196 |
if (useProposalList) |
| 1180 |
contentAssistRequest.addProposal(proposals[i]); |
1197 |
contentAssistRequest.addProposal(proposals[i]); |
|
Lines 1184-1191
Link Here
|
| 1184 |
} |
1201 |
} |
| 1185 |
} |
1202 |
} |
| 1186 |
} |
1203 |
} |
| 1187 |
|
1204 |
|
| 1188 |
|
|
|
| 1189 |
protected void addEntityProposals(ContentAssistRequest contentAssistRequest, int documentPosition, ITextRegion completionRegion, IDOMNode treeNode) { |
1205 |
protected void addEntityProposals(ContentAssistRequest contentAssistRequest, int documentPosition, ITextRegion completionRegion, IDOMNode treeNode) { |
| 1190 |
// ignore |
1206 |
// ignore |
| 1191 |
} |
1207 |
} |
