Commit d166e04

authored

Merge pull request #2439 from Haehnchen/feature/access-bundle-lookup

Fix read thread access of bundle files lookup rendering

2 parents 4dba4c3 + ccaeba9 commit d166e04Copy full SHA for d166e04

File tree

2 files changed

+23

-19

lines changed

src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict
- SymfonyBundle.java
- SymfonyBundleFileLookupElement.java

2 files changed

+23

-19

lines changed

`‎src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/SymfonyBundle.java‎`

Lines changed: 12 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,12 @@ public class SymfonyBundle {`
`16`	`16`	`@NotNull`
`17`	`17`	`final private PhpClass phpClass;`
`18`	`18`
	`19`	`+ @NotNull`
	`20`	`+ final private String phpClassName;`
	`21`	`+`
	`22`	`+ @NotNull`
	`23`	`+ private final String phpClassNameNamespaceName;`
	`24`	`+`
`19`	`25`	`@NotNull`
`20`	`26`	`public PhpClass getPhpClass() {`
`21`	`27`	`return this.phpClass;`
`@@ -28,11 +34,14 @@ public String getNamespaceName() {`
`28`	`34`
`29`	`35`	`@NotNull`
`30`	`36`	`public String getName() {`
`31`		`- return this.phpClass.getName();`
	`37`	`+ return this.phpClassName;`
`32`	`38`	`}`
`33`	`39`
`34`	`40`	`public SymfonyBundle(@NotNull PhpClass phpClass) {`
`35`	`41`	`this.phpClass = phpClass;`
	`42`	`+`
	`43`	`+ this.phpClassName = this.phpClass.getName();`
	`44`	`+ this.phpClassNameNamespaceName = this.phpClass.getNamespaceName();`
`36`	`45`	`}`
`37`	`46`
`38`	`47`	`@Nullable`
`@@ -41,12 +50,7 @@ public PsiDirectory getDirectory() {`
`41`	`50`	`return null;`
`42`	`51`	`}`
`43`	`52`
`44`		`- PsiDirectory bundleDirectory = this.phpClass.getContainingFile().getContainingDirectory();`
`45`		`- if(null == bundleDirectory) {`
`46`		`- return null;`
`47`		`- }`
`48`		`-`
`49`		`- return bundleDirectory;`
	`53`	`+ return this.phpClass.getContainingFile().getContainingDirectory();`
`50`	`54`	`}`
`51`	`55`
`52`	`56`	`@Nullable`
`@@ -78,7 +82,7 @@ public String getRelativePath(@NotNull VirtualFile file) {`
`78`	`82`	`}`
`79`	`83`
`80`	`84`	`public boolean isInBundle(@NotNull PhpClass phpClass) {`
`81`		`- return phpClass.getNamespaceName().startsWith(this.phpClass.getNamespaceName());`
	`85`	`+ return phpClass.getNamespaceName().startsWith(this.phpClassNameNamespaceName);`
`82`	`86`	`}`
`83`	`87`
`84`	`88`	`public boolean isInBundle(@NotNull PsiFile psiFile) {`

`‎src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/SymfonyBundleFileLookupElement.java‎`

Lines changed: 11 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,17 +6,21 @@`
`6`	`6`	`import com.intellij.codeInsight.lookup.LookupElementPresentation;`
`7`	`7`	`import com.intellij.util.IconUtil;`
`8`	`8`	`import org.jetbrains.annotations.NotNull;`
	`9`	`+import org.jetbrains.annotations.Nullable;`
`9`	`10`
`10`	`11`	`/**`
`11`	`12`	`* @author Daniel Espendiller <daniel@espendiller.net>`
`12`	`13`	`*/`
`13`	`14`	`public class SymfonyBundleFileLookupElement extends LookupElement {`
`14`		`-`
	`15`	`+privatefinal@NotNullStringbundleName;`
`15`	`16`	`private final BundleFile bundleFile;`
`16`	`17`	`private InsertHandler<LookupElement> insertHandler = null;`
	`18`	`+ private final @Nullable String shortcutName;`
`17`	`19`
`18`	`20`	`public SymfonyBundleFileLookupElement(BundleFile bundleFile) {`
`19`	`21`	`this.bundleFile = bundleFile;`
	`22`	`+ this.shortcutName = bundleFile.getShortcutPath();`
	`23`	`+ this.bundleName = bundleFile.getSymfonyBundle().getName();`
`20`	`24`	`}`
`21`	`25`
`22`	`26`	`public SymfonyBundleFileLookupElement(BundleFile bundleFile, InsertHandler<LookupElement> insertHandler) {`
`@@ -27,23 +31,21 @@ public SymfonyBundleFileLookupElement(BundleFile bundleFile, InsertHandler<Looku`
`27`	`31`	`@NotNull`
`28`	`32`	`@Override`
`29`	`33`	`public String getLookupString() {`
`30`		`- String shortcutName = this.bundleFile.getShortcutPath();`
`31`		`- if(shortcutName == null) {`
	`34`	`+ if (shortcutName == null) {`
`32`	`35`	`return "";`
`33`	`36`	`}`
`34`	`37`
`35`	`38`	`// we strip any control char, so only use the pathname`
`36`		`- if(shortcutName.startsWith("@")) {`
`37`		`- shortcutName = shortcutName.substring(1);`
	`39`	`+ if(shortcutName.startsWith("@")) {`
	`40`	`+ return shortcutName.substring(1);`
`38`	`41`	`}`
`39`	`42`
`40`	`43`	`return shortcutName;`
`41`	`44`	`}`
`42`	`45`
`43`	`46`	`@Override`
`44`		`- public void handleInsert(InsertionContext context) {`
`45`		`-`
`46`		`- if(this.insertHandler != null) {`
	`47`	`+ public void handleInsert(@NotNull InsertionContext context) {`
	`48`	`+ if (this.insertHandler != null) {`
`47`	`49`	`this.insertHandler.handleInsert(context, this);`
`48`	`50`	`return;`
`49`	`51`	`}`
`@@ -53,10 +55,8 @@ public void handleInsert(InsertionContext context) {`
`53`	`55`
`54`	`56`	`public void renderElement(LookupElementPresentation presentation) {`
`55`	`57`	`presentation.setItemText(getLookupString());`
`56`		`- presentation.setTypeText(this.bundleFile.getSymfonyBundle().getName());`
	`58`	`+ presentation.setTypeText(bundleName);`
`57`	`59`	`presentation.setTypeGrayed(true);`
`58`	`60`	`presentation.setIcon(IconUtil.getIcon(this.bundleFile.getVirtualFile(), 0, this.bundleFile.getProject()));`
`59`		`-`
`60`	`61`	`}`
`61`		`-`
`62`	`62`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit d166e04

File tree

2 files changed

2 files changed

`‎src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/SymfonyBundle.java‎`

`‎src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/SymfonyBundleFileLookupElement.java‎`

0 commit comments