azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete interface for JetTypeCodeFragmentImpl

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-04-24 17:29:02 +04:00
parent 8bbbe8f0f6
commit 876878a54c
3 changed files with 35 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.java
+1 -1
View File
@@ -334,7 +334,7 @@ public class JetPsiFactory {
@NotNull
public static JetTypeCodeFragment createTypeCodeFragment(Project project, String text, PsiElement context) {
return new JetTypeCodeFragmentImpl(project, "fragment.kt", text, context);
return new JetTypeCodeFragment(project, "fragment.kt", text, context);
}
@NotNull
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragment.java
+34 -3
View File
@@ -16,11 +16,42 @@
package org.jetbrains.jet.lang.psi;
import com.intellij.psi.PsiCodeFragment;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetTokens;
public class JetTypeCodeFragment extends JetCodeFragment {
public JetTypeCodeFragment(Project project, String name, CharSequence text, PsiElement context) {
super(project, name, text, JetNodeTypes.TYPE_CODE_FRAGMENT, context);
}
public interface JetTypeCodeFragment extends PsiCodeFragment {
@Nullable
JetType getType();
public JetType getType() {
JetType type = null;
for (PsiElement child : getChildren()) {
IElementType elementType = child.getNode().getElementType();
if (elementType == JetNodeTypes.TYPE_CODE_FRAGMENT) {
for (PsiElement grChild : child.getChildren()) {
if (grChild instanceof JetTypeReference) {
if (!grChild.getText().isEmpty())
//TODO return the actual type
type = KotlinBuiltIns.getInstance().getAnyType();
}
else if (!JetTokens.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(elementType))
return null;
}
}
else if (!JetTokens.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(elementType))
return null;
}
return type;
}
}
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragmentImpl.java
-58
View File
@@ -1,58 +0,0 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.jet.lang.psi;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetTokens;
public class JetTypeCodeFragmentImpl extends JetCodeFragment implements JetTypeCodeFragment {
public JetTypeCodeFragmentImpl(Project project, String name, CharSequence text, PsiElement context) {
super(project, name, text, JetNodeTypes.TYPE_CODE_FRAGMENT, context);
}
@Nullable
@Override
public JetType getType() {
JetType type = null;
for (PsiElement child : getChildren()) {
IElementType elementType = child.getNode().getElementType();
if (elementType == JetNodeTypes.TYPE_CODE_FRAGMENT) {
for (PsiElement grChild : child.getChildren()) {
if (grChild instanceof JetTypeReference) {
if (!grChild.getText().isEmpty())
//TODO return the actual type
type = KotlinBuiltIns.getInstance().getAnyType();
}
else if (!JetTokens.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(elementType))
return null;
}
}
else if (!JetTokens.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(elementType))
return null;
}
return type;
}
}