[zeppelin] branch branch-0.9 updated: ZEPPELIN-4992 Editor settings are being set to the default interpreter regardless of the interpreter specified in the paragraph.

[zj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zjffdu pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/branch-0.9 by this push:
     new b7e52ee  ZEPPELIN-4992 Editor settings are being set to the default interpreter regardless of the interpreter specified in the paragraph.
b7e52ee is described below

commit b7e52ee6c7395bd8f80bc872b44054299bda06a3
Author: Jason Ogaard <ja...@fico.com>
AuthorDate: Fri Aug 14 15:21:01 2020 -0600

    ZEPPELIN-4992 Editor settings are being set to the default interpreter regardless of the interpreter specified in the paragraph.
    
    ### What is this PR for?
    I wrote up this [defect](https://issues.apache.org/jira/browse/ZEPPELIN-4992) based on the behavior of the zeppelin 0.9.0 image found on the docker [hub](https://hub.docker.com/r/apache/zeppelin/tags). Currently, the editor settings aren't being applied to each interpreter, instead only the default interpreter editor settings get applied to every paragraph regardless of the interpreter specified.
    
    This PR should fix that issue.
    
    ### What type of PR is it?
    [Bug Fix]
    
    ### Todos
    * None
    
    ### What is the Jira issue?
    * [ZEPPELIN-4992](https://issues.apache.org/jira/browse/ZEPPELIN-4992)
    
    ### How should this be tested?
    * Ensure that the various niceties for each interpreter are applied. E.G. syntax highlighting, code auto-hiding.
    
    ### Screenshots (if appropriate)
    
    ### Questions:
    * Does the licenses files need update?
    No
    * Is there breaking changes for older versions?
    No
    * Does this needs documentation?
    No
    
    Author: Jason Ogaard <ja...@fico.com>
    
    Closes #3877 from jason-ogaard/master and squashes the following commits:
    
    b10e21f58 [Jason Ogaard] ZEPPELIN-4992 interpreter editor settings are always being set to the default regardless of the interpreter specified in the paragraph. This should fix that issue.
    
    (cherry picked from commit a7bcf087c0f821deb2e84403161d6cf6fd4242ba)
    Signed-off-by: Jeff Zhang <zj...@apache.org>
---
 .../java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
index 5fb9ad0..42e747d 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
@@ -594,7 +594,7 @@ public class InterpreterSettingManager implements NoteEventListener, ClusterEven
             if (interpreterSetting == null) {
               return DEFAULT_EDITOR;
             }
-            return interpreterSetting.getDefaultInterpreterInfo().getEditor();
+            return interpreterSetting.getInterpreterInfo(intpName).getEditor();
           } catch (Exception e) {
             LOGGER.warn(e.getMessage());
             return DEFAULT_EDITOR;