Skip to content

Commit b09d1d8

Browse files
Merge pull request #6912 from microsoft/endgame-202208
sync to 202208.next
2 parents e074766 + 03250a3 commit b09d1d8

File tree

11 files changed

+102
-35
lines changed

11 files changed

+102
-35
lines changed

CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in this file.
44

55
- [Change Log](#change-log)
6+
- [3.68.0](#3680)
67
- [3.67.0](#3670)
78
- [3.66.0](#3660)
89
- [3.65.0](#3650)
@@ -85,6 +86,32 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
8586
- [3.0.8](#308)
8687
- [3.0.7](#307)
8788
- [3.0.6](#306)
89+
## 3.68.0
90+
### Added
91+
- Added support for resource management of `Azure Cosmos DB accounts` in Azure Explorer.
92+
- Added support for resource connection to `Azure Cosmos DB accounts`.
93+
- Added support for creating data source of the Mongo and Cassandra API for `Azure Cosmos DB` from both Azure Explorer and `Database` tool window (`IntelliJ IDEA Ultimate Edition` only).
94+
- Added support for connecting an `Azure Virtual Machine` using SSH directly from an `Azure Virtual Machine` resource node in Azure Explorer.
95+
- Added support for browsing files of an `Azure Virtual Machine` from an `Azure Virtual Machine` resource node in Azure Explorer (`IntelliJ IDEA Ultimate Edition` only).
96+
- Added support for adding dependencies to current local project from `Azure SDK reference book`.
97+
- Added support for jumping to corresponding Azure SDK page in `Azure SDK reference book` from Azure Explorer nodes.
98+
- Added support for configuring environment variables when deploy artifacts to an `Azure Web App`.
99+
- Added support for Java 17 for `Azure Functions`.
100+
- Added support for refreshing items (when needed) of combobox components at place.
101+
102+
### Changed
103+
- Default values of most input components in Azure resource creation/deployment dialogs are now learnt from history usage records.
104+
- Local meta-data files of Azure SDK reference book is updated to latest.
105+
106+
### Fixed
107+
- Loading spring apps take more time than normal.
108+
- Creating resources shows repeatedly in ComboBox components sometimes.
109+
- Stopped Azure Function app won't be the default app in deploy dialog.
110+
- App settings of a newly deployed Azure Function app won't be updated in Properties view until sign-out and sign-in again.
111+
- Validation error message doesn't popup when hovering on the input components.
112+
- [#6790](https://github.com/microsoft/azure-tools-for-java/issues/6790): Uncaught Exception com.intellij.serviceContainer.AlreadyDisposedException: Already disposed: Project(*) (disposed)
113+
- [#6784](https://github.com/microsoft/azure-tools-for-java/issues/6784): Uncaught Exception com.intellij.openapi.util.TraceableDisposable$DisposalException: Library LibraryId(*) already disposed
114+
- [#6813](https://github.com/microsoft/azure-tools-for-java/issues/6813): Uncaught Exception com.microsoft.azure.toolkit.lib.common.operation.OperationException: setup run configuration for Azure Functions
88115

89116
## 3.67.0
90117
### Added

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/FunctionRunConfigurationProducer.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,17 @@ public boolean isConfigurationFromContext(AzureRunConfigurationBase appConfigura
101101
}
102102

103103
private static Location<PsiMethod> getAzureFunctionMethods(final Location<?> location) {
104-
for (Iterator<Location<PsiMethod>> iterator = location.getAncestors(PsiMethod.class, false); iterator.hasNext();) {
105-
final Location<PsiMethod> methodLocation = iterator.next();
106-
if (FunctionUtils.isFunctionClassAnnotated(methodLocation.getPsiElement())) {
107-
return methodLocation;
104+
try {
105+
for (Iterator<Location<PsiMethod>> iterator = location.getAncestors(PsiMethod.class, false); iterator.hasNext(); ) {
106+
final Location<PsiMethod> methodLocation = iterator.next();
107+
if (FunctionUtils.isFunctionClassAnnotated(methodLocation.getPsiElement())) {
108+
return methodLocation;
109+
}
108110
}
111+
return null;
112+
} catch (Throwable e) {
113+
return null;
109114
}
110-
return null;
111115
}
112116

113117
private Module findModule(FunctionRunConfiguration configuration, Module contextModule) {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/AzureComboBox.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,11 +267,7 @@ protected void setLoading(final boolean loading) {
267267
public void setEnabled(boolean b) {
268268
this.enabled = b;
269269
super.setEnabled(b);
270-
if (b) {
271-
this.setLoading(this.loading);
272-
} else {
273-
this.setEditor(null);
274-
}
270+
this.setLoading(this.loading);
275271
}
276272

277273
@Override
@@ -385,6 +381,9 @@ protected JTextField createEditorComponent() {
385381

386382
@Nullable
387383
protected List<Extension> getExtensions() {
384+
if (!AzureComboBox.this.enabled) {
385+
return Collections.emptyList();
386+
}
388387
if (AzureComboBox.this.loading) {
389388
return List.of(Extension.create(new AnimatedIcon.Default(), "Loading...", null));
390389
}

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/survey/CustomerSurveyManager.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ public synchronized void takeSurvey(@Nonnull final Project project, final ICusto
7474
}
7575

7676
private void showSurveyPopup(final @Nonnull Project project, final ICustomerSurvey survey) {
77+
if (project.isDisposed()) {
78+
return;
79+
}
7780
final SurveyPopUpDialog popUpDialog = new SurveyPopUpDialog(project, survey, response -> {
7881
try {
7982
if (response == CustomerSurveyResponse.ACCEPT) {
1.29 MB
Loading
2.11 MB
Loading
416 KB
Loading

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/resources/whatsnew.md

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,36 @@
1-
<!-- Version: 3.66.0 -->
1+
<!-- Version: 3.68.0 -->
22
# What's new in Azure Toolkit for IntelliJ
33

4+
## 3.68.0
5+
### Added
6+
- Added support for resource management of `Azure Cosmos DB accounts` in Azure Explorer.
7+
- Added support for resource connection to `Azure Cosmos DB accounts`.
8+
- Added support for creating data source of the Mongo and Cassandra API for `Azure Cosmos DB` from both Azure Explorer and `Database` tool window (`IntelliJ IDEA Ultimate Edition` only).
9+
<img src="https://raw.githubusercontent.com/microsoft/azure-tools-for-java/endgame-202208/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/resources/whatsnew.assets/202208.datasource.gif" alt="screenshot of 'cosmos datasource'" width="500"/>
10+
- Added support for connecting an `Azure Virtual Machine` using SSH directly from an `Azure Virtual Machine` resource node in Azure Explorer.
11+
- Added support for browsing files of an `Azure Virtual Machine` from an `Azure Virtual Machine` resource node in Azure Explorer (`IntelliJ IDEA Ultimate Edition` only).
12+
<img src="https://raw.githubusercontent.com/microsoft/azure-tools-for-java/endgame-202208/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/resources/whatsnew.assets/202208.vm.gif" alt="screenshot of 'virtual machine'" width="500"/>
13+
- Added support for adding dependencies to current local project from `Azure SDK reference book`.
14+
- Added support for jumping to corresponding Azure SDK page in `Azure SDK reference book` from Azure Explorer nodes.
15+
<img src="https://raw.githubusercontent.com/microsoft/azure-tools-for-java/endgame-202208/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/resources/whatsnew.assets/202208.sdk.gif" alt="screenshot of 'sdk reference book'" width="500"/>
16+
- Added support for configuring environment variables when deploy artifacts to an `Azure Web App`.
17+
- Added support for Java 17 for `Azure Functions`.
18+
- Added support for refreshing items (when needed) of combobox components at place.
19+
20+
### Changed
21+
- Default values of most input components in Azure resource creation/deployment dialogs are now learnt from history usage records.
22+
- Local meta-data files of Azure SDK reference book is updated to latest.
23+
24+
### Fixed
25+
- Loading spring apps take more time than normal.
26+
- Creating resources shows repeatedly in ComboBox components sometimes.
27+
- Stopped Azure Function app won't be the default app in deploy dialog.
28+
- App settings of a newly deployed Azure Function app won't be updated in Properties view until sign-out and sign-in again.
29+
- Validation error message doesn't popup when hovering on the input components.
30+
- [#6790](https://github.com/microsoft/azure-tools-for-java/issues/6790): Uncaught Exception com.intellij.serviceContainer.AlreadyDisposedException: Already disposed: Project(*) (disposed)
31+
- [#6784](https://github.com/microsoft/azure-tools-for-java/issues/6784): Uncaught Exception com.intellij.openapi.util.TraceableDisposable$DisposalException: Library LibraryId(*) already disposed
32+
- [#6813](https://github.com/microsoft/azure-tools-for-java/issues/6813): Uncaught Exception com.microsoft.azure.toolkit.lib.common.operation.OperationException: setup run configuration for Azure Functions
33+
434
## 3.67.0
535
### Added
636
- New Azure service support: Azure Kubernetes service.

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-resource-connector-lib/src/main/java/com/microsoft/azure/toolkit/intellij/connector/ConnectorDialog.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ public void setResource(@Nullable final Resource<?> resource) {
177177
this.setResourceDefinition(resource.getDefinition());
178178
//noinspection unchecked
179179
this.resourcePanel.setValue(resource);
180-
this.resourceTypeSelector.setEnabled(false);
181180
} else {
182181
ResourceManager.getDefinitions(RESOURCE).stream().findFirst().ifPresent(this::setResourceDefinition);
183182
}
@@ -188,7 +187,6 @@ public void setConsumer(@Nullable final Resource<?> consumer) {
188187
this.setConsumerDefinition(consumer.getDefinition());
189188
//noinspection unchecked
190189
this.consumerPanel.setValue(consumer);
191-
this.consumerTypeSelector.setEnabled(false);
192190
} else {
193191
ResourceManager.getDefinitions(CONSUMER).stream().findFirst().ifPresent(this::setConsumerDefinition);
194192
}

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/function/CreateFunctionAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ protected PsiElement[] create(@NotNull String s, PsiDirectory psiDirectory) thro
158158
@Override
159159
protected boolean isAvailable(final DataContext dataContext) {
160160
final Project project = CommonDataKeys.PROJECT.getData(dataContext);
161-
if (project == null) {
161+
if (project == null || project.isDisposed()) {
162162
return false;
163163
}
164164
final IdeView view = LangDataKeys.IDE_VIEW.getData(dataContext);

0 commit comments

Comments
 (0)