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

refactor

Browse Source
This commit is contained in:
Pavel Talanov
2012-01-26 20:30:52 +04:00
parent ba37e7ef09
commit ac5d7a197c
3 changed files with 64 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+37 -43
View File
@@ -10,20 +10,14 @@
</component>
<component name="BookmarkManager">
<bookmark url="file://$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/safeCallReturnsNullIfFails.kt" line="3" />
<bookmark url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" line="67" />
<bookmark url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" line="57" />
<bookmark url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java" line="155" mnemonic="2" />
</component>
<component name="ChangeListManager">
<list default="true" id="f02ef53d-47a4-4f5e-a1aa-3df68aae9b20" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/Analyzer.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/JetFileUtils.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/jquery.kt" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/libImplementations/jQuery.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../WebView/.idea/workspace.xml" afterPath="$PROJECT_DIR$/../WebView/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StaticContext.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StaticContext.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/Analyzer.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/Analyzer.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/JetFileUtils.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/JetFileUtils.java" />
</list>
<ignored path="k2js.iws" />
<ignored path=".idea/workspace.xml" />
@@ -281,7 +275,7 @@
<favorites_list name="k2js" />
</component>
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.46774197">
<splitter split-orientation="horizontal" split-proportion="0.43108505">
<split-first>
<leaf>
<file leaf-file-name="Arrays.kt" pinned="false" current="false" current-in-tab="false">
@@ -347,14 +341,14 @@
</provider>
</entry>
</file>
<file leaf-file-name="Analyzer.java" pinned="false" current="true" current-in-tab="true">
<file leaf-file-name="Analyzer.java" pinned="false" current="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/Analyzer.java">
<provider selected="true" editor-type-id="text-editor">
<state line="45" column="32" selection-start="1651" selection-end="1651" vertical-scroll-proportion="-0.15295815">
<state line="24" column="46" selection-start="799" selection-end="799" vertical-scroll-proportion="0.4227994">
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1164#1173#0" expanded="true" />
<element signature="e#1537#1546#0" expanded="true" />
<element signature="e#1169#1178#0" expanded="true" />
<element signature="e#2182#2191#0" expanded="true" />
</folding>
</state>
</provider>
@@ -382,12 +376,12 @@
</split-first>
<split-second>
<leaf>
<file leaf-file-name="K2JSTranslator.java" pinned="false" current="false" current-in-tab="true">
<file leaf-file-name="K2JSTranslator.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java">
<provider selected="true" editor-type-id="text-editor">
<state line="94" column="83" selection-start="3705" selection-end="3705" vertical-scroll-proportion="0.4">
<state line="27" column="19" selection-start="897" selection-end="897" vertical-scroll-proportion="0.21398601">
<folding>
<element signature="e#2356#2365#0" expanded="true" />
<element signature="e#1904#1913#0" expanded="true" />
</folding>
</state>
</provider>
@@ -396,7 +390,7 @@
<file leaf-file-name="JetFileUtils.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/JetFileUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state line="57" column="8" selection-start="1664" selection-end="1664" vertical-scroll-proportion="0.0">
<state line="30" column="0" selection-start="866" selection-end="866" vertical-scroll-proportion="0.0">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -514,9 +508,9 @@
<option value="$PROJECT_DIR$/translator/testFiles/libImplementations/jQuery.js" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StaticContext.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/JetFileUtils.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/Analyzer.java" />
<option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/JetFileUtils.java" />
</list>
</option>
</component>
@@ -1330,7 +1324,7 @@
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32977018" sideWeight="0.6570605" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3997862" sideWeight="0.6705998" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2709781" sideWeight="0.7463977" order="0" side_tool="false" content_ui="combo" />
<window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2536023" sideWeight="0.8530198" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2536023" sideWeight="0.8530198" order="2" side_tool="false" content_ui="tabs" />
<window_info id="CodeWindow" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.0908605" sideWeight="0.7146974" order="2" side_tool="false" content_ui="combo" />
<window_info id="ResolveWindow" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1377,7 +1371,7 @@
<option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
<option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
<option name="LAST_COMMIT_MESSAGE" value="test for one namespace defined in multiple files" />
<option name="LAST_COMMIT_MESSAGE" value="add configuration for using js backend &#10;refactor K2JSTranslator" />
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -1390,7 +1384,6 @@
<option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
<MESSAGE value="switch to using ValueParameterDescriptor instead of JetParameter when translating function declarations&#10;implemented support for implicit 'it' parameter&#10;added 'clear' function to ArrayList temporary implementation" />
<MESSAGE value="switch to using descriptors on call site&#10;default arguments support" />
<MESSAGE value="ongoing refactoring" />
<MESSAGE value="refactoring call translator" />
@@ -1415,6 +1408,7 @@
<MESSAGE value="big refactoring for StandardClasses class" />
<MESSAGE value="tests for expression as function" />
<MESSAGE value="test for one namespace defined in multiple files" />
<MESSAGE value="add configuration for using js backend &#10;refactor K2JSTranslator" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
@@ -1487,24 +1481,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/JetFileUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state line="57" column="8" selection-start="1664" selection-end="1664" vertical-scroll-proportion="0.0">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java">
<provider selected="true" editor-type-id="text-editor">
<state line="94" column="83" selection-start="3705" selection-end="3705" vertical-scroll-proportion="0.4">
<folding>
<element signature="e#2356#2365#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../Kotlin/jet/stdlib/ktSrc/jssupport/JsDeclarations.kt">
<provider selected="true" editor-type-id="text-editor">
<state line="1" column="0" selection-start="17" selection-end="18" vertical-scroll-proportion="0.0">
@@ -1535,11 +1511,29 @@
</entry>
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/Analyzer.java">
<provider selected="true" editor-type-id="text-editor">
<state line="45" column="32" selection-start="1651" selection-end="1651" vertical-scroll-proportion="-0.15295815">
<state line="24" column="46" selection-start="799" selection-end="799" vertical-scroll-proportion="0.4227994">
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1164#1173#0" expanded="true" />
<element signature="e#1537#1546#0" expanded="true" />
<element signature="e#1169#1178#0" expanded="true" />
<element signature="e#2182#2191#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/JetFileUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state line="30" column="0" selection-start="866" selection-end="866" vertical-scroll-proportion="0.0">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java">
<provider selected="true" editor-type-id="text-editor">
<state line="27" column="19" selection-start="897" selection-end="897" vertical-scroll-proportion="0.21398601">
<folding>
<element signature="e#1904#1913#0" expanded="true" />
</folding>
</state>
</provider>
translator/src/org/jetbrains/k2js/Analyzer.java
+24 -6
View File
@@ -22,6 +22,7 @@ import java.util.List;
*/
public final class Analyzer {
//TODO: provide some generic way to access
private static final List<String> LIB_FILE_NAMES = Arrays.asList(
"C:\\Dev\\Projects\\Kotlin\\jet\\stdlib\\ktSrc\\jssupport\\JsSupport.jet",
"C:\\Dev\\Projects\\Kotlin\\jet\\stdlib\\ktSrc\\jssupport\\JsDeclarations.kt"
@@ -39,19 +40,36 @@ public final class Analyzer {
@NotNull
public static BindingContext analyzeFiles(@NotNull List<JetFile> files) {
final List<JetFile> jsLibFiles = getJsSupportStdLib();
List<JetFile> allFiles = allFiles(files, jsLibFiles);
Project project = getProject(files);
return AnalyzingUtils.analyzeFiles(project, JsConfiguration.jsLibConfiguration(project),
allFiles, notLibFiles(jsLibFiles), JetControlFlowDataTraceFactory.EMPTY);
}
@NotNull
private static Project getProject(@NotNull List<JetFile> files) {
assert !files.isEmpty();
return files.iterator().next().getProject();
}
@NotNull
private static List<JetFile> allFiles(@NotNull List<JetFile> files,
@NotNull List<JetFile> jsLibFiles) {
List<JetFile> allFiles = new ArrayList<JetFile>();
allFiles.addAll(files);
allFiles.addAll(jsLibFiles);
assert !files.isEmpty();
Project project = files.iterator().next().getProject();
return AnalyzingUtils.analyzeFiles(project, new JsConfiguration(project),
allFiles, new Predicate<PsiFile>() {
return allFiles;
}
@NotNull
private static Predicate<PsiFile> notLibFiles(@NotNull final List<JetFile> jsLibFiles) {
return new Predicate<PsiFile>() {
@Override
public boolean apply(@Nullable PsiFile file) {
assert file instanceof JetFile;
return (!jsLibFiles.contains(file));
}
}, JetControlFlowDataTraceFactory.EMPTY);
};
}
private static class JsConfiguration implements Configuration {
@@ -59,7 +77,7 @@ public final class Analyzer {
@NotNull
private Project project;
public static JsConfiguration createStandardConfiguration(@NotNull Project project) {
public static JsConfiguration jsLibConfiguration(@NotNull Project project) {
return new JsConfiguration(project);
}
translator/src/org/jetbrains/k2js/JetFileUtils.java
+3 -2
View File
@@ -29,7 +29,6 @@ public final class JetFileUtils {
}
});
@NotNull
public static String loadFile(@NotNull String path) throws IOException {
return doLoadFile(path);
@@ -60,8 +59,10 @@ public final class JetFileUtils {
private static PsiFile createFile(@NotNull String name, @NotNull String text) {
LightVirtualFile virtualFile = new LightVirtualFile(name, JetLanguage.INSTANCE, text);
virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET);
return ((PsiFileFactoryImpl) PsiFileFactory.getInstance(environment.getProject()))
PsiFile result = ((PsiFileFactoryImpl) PsiFileFactory.getInstance(environment.getProject()))
.trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false);
assert result != null;
return result;
}
}