Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cache all computed Elixir levels #1408

Merged
merged 4 commits into from
Mar 7, 2019
Merged

Cache all computed Elixir levels #1408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa23c14
Cache all computed levels
KronicDeth Mar 5, 2019
43832bb
Update version
KronicDeth Mar 5, 2019
53e016a
Add #1407 and #1408 to changelogs
KronicDeth Mar 7, 2019
55e52fa
Don't cache LEVEL to Sdk in test mode
KronicDeth Mar 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 55 additions & 49 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,182 +4,188 @@ Table of Contents
* [Changelog](#changelog)
* [v10.3.0](#v1030)
* [Enhancements](#enhancements)
* [Bug Fixes](#bug-fixes)
* [v10.2.0](#v1020)
* [Enhancements](#enhancements-1)
* [Bug Fixes](#bug-fixes)
* [Bug Fixes](#bug-fixes-1)
* [v10.1.0](#v1010)
* [Enhancements](#enhancements-2)
* [Bug Fixes](#bug-fixes-1)
* [v10.0.1](#v1001)
* [Bug Fixes](#bug-fixes-2)
* [v10.0.1](#v1001)
* [Bug Fixes](#bug-fixes-3)
* [v10.0.0](#v1000)
* [Enhancements](#enhancements-3)
* [Bug Fixes](#bug-fixes-3)
* [Bug Fixes](#bug-fixes-4)
* [Incompatible Changes](#incompatible-changes)
* [v9.0.0](#v900)
* [Enhancements](#enhancements-4)
* [Bug Fixes](#bug-fixes-4)
* [Bug Fixes](#bug-fixes-5)
* [Incompatible Changs](#incompatible-changs)
* [v8.1.0](#v810)
* [Enhancements](#enhancements-5)
* [Bug Fixes](#bug-fixes-5)
* [Bug Fixes](#bug-fixes-6)
* [v8.0.0](#v800)
* [Enhancements](#enhancements-6)
* [Bug Fixes](#bug-fixes-6)
* [Bug Fixes](#bug-fixes-7)
* [Incompatible Changes](#incompatible-changes-1)
* [v7.5.0](#v750)
* [Enhancements](#enhancements-7)
* [Bug Fixes](#bug-fixes-7)
* [Bug Fixes](#bug-fixes-8)
* [v7.4.0](#v740)
* [Enhancements](#enhancements-8)
* [Bug Fixes](#bug-fixes-8)
* [Bug Fixes](#bug-fixes-9)
* [v7.3.0](#v730)
* [Enhancements](#enhancements-9)
* [Bug Fixes](#bug-fixes-9)
* [v7.2.1](#v721)
* [Bug Fixes](#bug-fixes-10)
* [v7.2.1](#v721)
* [Bug Fixes](#bug-fixes-11)
* [v7.2.0](#v720)
* [Enhancements](#enhancements-10)
* [Bug Fixes](#bug-fixes-11)
* [Bug Fixes](#bug-fixes-12)
* [v7.1.0](#v710)
* [Enhancements](#enhancements-11)
* [Bug Fixes](#bug-fixes-12)
* [Bug Fixes](#bug-fixes-13)
* [v7.0.0](#v700)
* [Enhancements](#enhancements-12)
* [Bug Fixes](#bug-fixes-13)
* [Bug Fixes](#bug-fixes-14)
* [Incompatible Changes](#incompatible-changes-2)
* [v6.7.0](#v670)
* [Enhancements](#enhancements-13)
* [Bug Fixes](#bug-fixes-14)
* [Bug Fixes](#bug-fixes-15)
* [v6.6.0](#v660)
* [Enhancements](#enhancements-14)
* [Bug Fixes](#bug-fixes-15)
* [v6.5.1](#v651)
* [Bug Fixes](#bug-fixes-16)
* [v6.5.1](#v651)
* [Bug Fixes](#bug-fixes-17)
* [v6.5.0](#v650)
* [Enhancements](#enhancements-15)
* [Bug Fixes](#bug-fixes-17)
* [Bug Fixes](#bug-fixes-18)
* [v6.4.0](#v640)
* [Enhancements](#enhancements-16)
* [Bug Fixes](#bug-fixes-18)
* [Bug Fixes](#bug-fixes-19)
* [v6.3.0](#v630)
* [Enhancements](#enhancements-17)
* [Bug Fixes](#bug-fixes-19)
* [Bug Fixes](#bug-fixes-20)
* [v6.2.0](#v620)
* [Enhancements](#enhancements-18)
* [Bug Fixes](#bug-fixes-20)
* [v6.1.1](#v611)
* [Bug Fixes](#bug-fixes-21)
* [v6.1.1](#v611)
* [Bug Fixes](#bug-fixes-22)
* [v6.1.0](#v610)
* [Enhancements](#enhancements-19)
* [Bug Fixes](#bug-fixes-22)
* [Bug Fixes](#bug-fixes-23)
* [v6.0.0](#v600)
* [Enhancements](#enhancements-20)
* [Bug Fixes](#bug-fixes-23)
* [Bug Fixes](#bug-fixes-24)
* [Incompatible Changes](#incompatible-changes-3)
* [v5.1.0](#v510)
* [Enhancements](#enhancements-21)
* [Bug Fixes](#bug-fixes-24)
* [Bug Fixes](#bug-fixes-25)
* [v5.0.0](#v500)
* [Enhancements](#enhancements-22)
* [Bug Fixes](#bug-fixes-25)
* [Bug Fixes](#bug-fixes-26)
* [Incompatible Changes](#incompatible-changes-4)
* [v4.7.0](#v470)
* [Enhancements](#enhancements-23)
* [Bug Fixes](#bug-fixes-26)
* [Bug Fixes](#bug-fixes-27)
* [v4.6.0](#v460)
* [Enhancements](#enhancements-24)
* [Bug Fixes](#bug-fixes-27)
* [Bug Fixes](#bug-fixes-28)
* [v4.5.0](#v450)
* [Enhancements](#enhancements-25)
* [v4.4.0](#v440)
* [Enhancements](#enhancements-26)
* [Bug Fixes](#bug-fixes-28)
* [Bug Fixes](#bug-fixes-29)
* [v4.3.0](#v430)
* [Enhancements](#enhancements-27)
* [Bug Fixes](#bug-fixes-29)
* [Bug Fixes](#bug-fixes-30)
* [v4.2.0](#v420)
* [Enhancements](#enhancements-28)
* [Bug Fixes](#bug-fixes-30)
* [Bug Fixes](#bug-fixes-31)
* [v4.1.0](#v410)
* [Enhancements](#enhancements-29)
* [Bug Fixes](#bug-fixes-31)
* [Bug Fixes](#bug-fixes-32)
* [v4.0.0](#v400)
* [Enhancements](#enhancements-30)
* [Bug Fixes](#bug-fixes-32)
* [Bug Fixes](#bug-fixes-33)
* [Incompatible Changes](#incompatible-changes-5)
* [v3.0.1](#v301)
* [Bug Fixes](#bug-fixes-33)
* [Bug Fixes](#bug-fixes-34)
* [v3.0.0](#v300)
* [Enhancements](#enhancements-31)
* [Bug Fixes](#bug-fixes-34)
* [Bug Fixes](#bug-fixes-35)
* [Incompatible Changes](#incompatible-changes-6)
* [v2.2.0](#v220)
* [Enhancement](#enhancement)
* [Bug Fixes](#bug-fixes-35)
* [Bug Fixes](#bug-fixes-36)
* [v2.1.0](#v210)
* [Enhancement](#enhancement-1)
* [Bug Fixes](#bug-fixes-36)
* [Bug Fixes](#bug-fixes-37)
* [v2.0.0](#v200)
* [Enhancements](#enhancements-32)
* [Bug Fixes](#bug-fixes-37)
* [Bug Fixes](#bug-fixes-38)
* [Incompatible Changes](#incompatible-changes-7)
* [v1.2.1](#v121)
* [Enhancements](#enhancements-33)
* [Bug Fixes](#bug-fixes-38)
* [Bug Fixes](#bug-fixes-39)
* [v1.2.0](#v120)
* [Enhancements](#enhancements-34)
* [Bug Fixes](#bug-fixes-39)
* [Bug Fixes](#bug-fixes-40)
* [v1.1.0](#v110)
* [Enhancements](#enhancements-35)
* [v1.0.0](#v100)
* [Enhancements](#enhancements-36)
* [Bug Fixes](#bug-fixes-40)
* [Bug Fixes](#bug-fixes-41)
* [Incompatible Fixes](#incompatible-fixes)
* [v0.3.5](#v035)
* [Enhancements](#enhancements-37)
* [Bug Fixes](#bug-fixes-41)
* [Bug Fixes](#bug-fixes-42)
* [v0.3.4](#v034)
* [Enhancements](#enhancements-38)
* [v0.3.3](#v033)
* [Enhancements](#enhancements-39)
* [v0.3.2](#v032)
* [Bug Fixes](#bug-fixes-42)
* [Bug Fixes](#bug-fixes-43)
* [v0.3.1](#v031)
* [Enhancements](#enhancements-40)
* [v0.3.0](#v030)
* [Enhancements](#enhancements-41)
* [Incompatible Changes](#incompatible-changes-8)
* [v0.2.1](#v021)
* [Enhancements](#enhancements-42)
* [Bug Fixes](#bug-fixes-43)
* [Bug Fixes](#bug-fixes-44)
* [v0.2.0](#v020)
* [Enhancements](#enhancements-43)
* [Incompatible Changes](#incompatible-changes-9)
* [v0.1.4](#v014)
* [Enhancements](#enhancements-44)
* [Bug Fixes](#bug-fixes-44)
* [v0.1.3](#v013)
* [Bug Fixes](#bug-fixes-45)
* [v0.1.3](#v013)
* [Bug Fixes](#bug-fixes-46)
* [v0.1.2](#v012)
* [Enhancements](#enhancements-45)
* [v0.1.1](#v011)
* [Bug Fixes](#bug-fixes-46)
* [Bug Fixes](#bug-fixes-47)
* [v0.1.0](#v010)
* [Enhancements](#enhancements-46)
* [Bug Fixes](#bug-fixes-47)
* [Bug Fixes](#bug-fixes-48)
* [v0.0.3](#v003)
* [Enhancements](#enhancements-47)
* [v0.0.2](#v002)
* [Enhancements](#enhancements-48)
* [Bug Fixes](#bug-fixes-48)
* [Bug Fixes](#bug-fixes-49)

# Changelog

## v10.3.0

### Enhancements
* [#1404](https://github.com/KronicDeth/intellij-elixir/pull/1404) - Add Type Specifications to Dbgi tab for :elixir_erl backend. - [@KronicDeth](https://github.com/KronicDeth)
* [#1407](https://github.com/KronicDeth/intellij-elixir/pull/1407) - Bug Report issue template. - [@KronicDeth](https://github.com/KronicDeth)

### Bug Fixes
* [#1408](https://github.com/KronicDeth/intellij-elixir/pull/1408) - [@KronicDeth](https://github.com/KronicDeth)
* Cache all computed Elixir levels at the file, module, project, and SDK levels. The computed Elixir level is used to determine how to emulate the various grammar changes made for the different Elixir versions. This bug was potentially introduced as earlier as[v7.0.0]() (2017-12-15) and as late as [v7.5.0](https://github.com/KronicDeth/intellij-elixir/releases/tag/v7.5.0) (2018-06-03) as that's [the history for `LevelPropertyPusher.java`](https://github.com/KronicDeth/intellij-elixir/commits/da149f8430cd378e964ae5a53a127754b3a00bc9/src/org/elixir_lang/file/LevelPropertyPusher.java) and has affected all later versions. If you ever experienced the 6.X series as faster than the 7.X series and later, this bug may be why and you should upgrade/reinstall immediately.

## v10.2.0

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://www.jetbrains.com/intellij-repository/releases
# https://www.jetbrains.com/intellij-repository/snapshots

baseVersion = 10.2.0
baseVersion = 10.3.0
ideaVersion = 2018.3
javaVersion = 1.8
javaTargetVersion = 1.8
Expand Down
16 changes: 16 additions & 0 deletions resources/META-INF/changelog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,22 @@ <h1>v10.3.0</h1>
<p>Enhancements</p>
<ul>
<li>Add Type Specifications to Dbgi tab for <code>:elixir_erl</code> backend Debug Info.</li>
<li>Add Bug Report issue template.</li>
</ul>
</li>
<li>
<p>Bug Fixes</p>
<ul>
<li>
Cache all computed Elixir levels at the file, module, project, and SDK levels. The computed Elixir level is
used to determine how to emulate the various grammar changes made for the different Elixir versions. This bug
was potentially introduced as earlier as<a href="">v7.0.0</a> (2017-12-15) and as late as
<a href="https://github.com/KronicDeth/intellij-elixir/releases/tag/v7.5.0">v7.5.0</a> (2018-06-03) as
that's
<a href="https://github.com/KronicDeth/intellij-elixir/commits/da149f8430cd378e964ae5a53a127754b3a00bc9/src/org/elixir_lang/file/LevelPropertyPusher.java">
the history for <code>LevelPropertyPusher.java</code>
</a> and has affected all later versions.
</li>
</ul>
</li>
</ul>
Expand Down
76 changes: 70 additions & 6 deletions src/org/elixir_lang/file/LevelPropertyPusher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.intellij.ProjectTopics;
import com.intellij.diagnostic.PerformanceWatcher;
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.fileTypes.FileTypeManager;
Expand Down Expand Up @@ -51,11 +52,74 @@ public class LevelPropertyPusher implements FilePropertyPusher<Level> {
private final Map<Module, Sdk> sdkByModule = new WeakHashMap<>();

private static void putLevel(@NotNull Project project) {
project.putUserData(LEVEL, level(project));
project.putUserData(LEVEL, computeLevel(project));
}

public static Level level(@Nullable Sdk sdk) {
Level level;

if (sdk != null) {
level = sdk.getUserData(LEVEL);

if (level == null) {
level = computeLevel(sdk);

Application application = ApplicationManager.getApplication();

// MockSdk is not write-able
if (application == null || !application.isUnitTestMode()) {
sdk.putUserData(LEVEL, level);
}
}
} else {
level = MAXIMUM;
}

return level;
}

public static Level level(@NotNull Project project) {
Level level = project.getUserData(LEVEL);

if (level == null) {
level = computeLevel(project);
project.putUserData(LEVEL, level);
}

return level;
}

public static Level level(@NotNull Module module) {
Level level = module.getUserData(LEVEL);

if (level == null) {
level = computeLevel(module);
module.putUserData(LEVEL, level);
}

return level;
}

public static Level level(@NotNull Project project, @Nullable VirtualFile virtualFile) {
Level level = null;

if (virtualFile != null) {
level = virtualFile.getUserData(LEVEL);
}

if (level == null) {
level = computeLevel(project, virtualFile);

if (virtualFile != null) {
virtualFile.putUserData(LEVEL, level);
}
}

return level;
}

@NotNull
private static Level level(@NotNull Module module) {
private static Level computeLevel(@NotNull Module module) {
Level level;

Sdk sdk = mostSpecificSdk(module);
Expand All @@ -70,7 +134,7 @@ private static Level level(@NotNull Module module) {
}

@NotNull
public static Level level(@NotNull Project project, @Nullable VirtualFile virtualFile) {
private static Level computeLevel(@NotNull Project project, @Nullable VirtualFile virtualFile) {
Level level;

if (virtualFile == null) {
Expand All @@ -89,7 +153,7 @@ public static Level level(@NotNull Project project, @Nullable VirtualFile virtua
}

@NotNull
public static Level level(@NotNull Project project) {
private static Level computeLevel(@NotNull Project project) {
Level level;

final ModuleManager moduleManager = ModuleManager.getInstance(project);
Expand All @@ -114,7 +178,7 @@ public static Level level(@NotNull Project project) {
projectLevel = maxLevel;
} else {
Sdk projectSdk = ProjectRootManager.getInstance(project).getProjectSdk();
projectLevel = level(projectSdk);
projectLevel = computeLevel(projectSdk);
}
}

Expand All @@ -125,7 +189,7 @@ public static Level level(@NotNull Project project) {

@NotNull
@Contract(pure = true)
public static Level level(@Nullable Sdk sdk) {
private static Level computeLevel(@Nullable Sdk sdk) {
Release release = Type.getRelease(sdk);
Level level;

Expand Down