MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Live Templates. Substituting Template via TemplateSubstitutor implemented. After review fix

Browse Source
This commit is contained in:
Andrey Vokin
2014-12-18 13:11:38 +03:00
parent 247bab9084
commit 88f0aabaea
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSubstitutor.java → platform/lang-impl/src/com/intellij/codeInsight/template/TemplateSubstitutor.java
+4 -2
View File
@@ -13,16 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.codeInsight.template.impl;
package com.intellij.codeInsight.template;
import com.intellij.codeInsight.template.impl.TemplateImpl;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public interface TemplateSubstitutor {
ExtensionPointName<TemplateSubstitutor> EP_NAME = ExtensionPointName.create("com.intellij.liveTemplateSubstitutor");
@Nullable
TemplateImpl substituteTemplate(final Editor editor, final PsiFile file, int caretOffset, final TemplateImpl template);
TemplateImpl substituteTemplate(@NotNull PsiFile file, int caretOffset, @NotNull TemplateImpl template);
}
platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
+2 -2
View File
@@ -351,9 +351,9 @@ public class TemplateState implements Disposable {
}
}
private TemplateImpl substituteTemplate(final PsiFile file, int caretOffset, TemplateImpl template) {
private static TemplateImpl substituteTemplate(final PsiFile file, int caretOffset, TemplateImpl template) {
for (TemplateSubstitutor substitutor : Extensions.getExtensions(TemplateSubstitutor.EP_NAME)) {
final TemplateImpl substituted = substitutor.substituteTemplate(myEditor, file, caretOffset, template);
final TemplateImpl substituted = substitutor.substituteTemplate(file, caretOffset, template);
if (substituted != null) {
template = substituted;
}
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
+1 -1
View File
@@ -318,7 +318,7 @@
<extensionPoint name="liveTemplateMacro" interface="com.intellij.codeInsight.template.Macro"/>
<extensionPoint name="liveTemplateOptionalProcessor" interface="com.intellij.codeInsight.template.impl.TemplateOptionalProcessor"/>
<extensionPoint name="liveTemplatePreprocessor" interface="com.intellij.codeInsight.template.impl.TemplatePreprocessor"/>
<extensionPoint name="liveTemplateSubstitutor" interface="com.intellij.codeInsight.template.impl.TemplateSubstitutor"/>
<extensionPoint name="liveTemplateSubstitutor" interface="com.intellij.codeInsight.template.TemplateSubstitutor"/>
<extensionPoint name="customLiveTemplate" interface="com.intellij.codeInsight.template.CustomLiveTemplate"/>
<extensionPoint name="variableTypeCalculator" interface="com.intellij.codeInsight.template.macro.VariableTypeCalculator"/>