1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/lexer/BuiltinException.java Fri Sep 11 16:53:49 2015 +0200
1.3 @@ -0,0 +1,127 @@
1.4 +/*
1.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1.6 + *
1.7 + * Copyright 2015 Oracle and/or its affiliates. All rights reserved.
1.8 + *
1.9 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1.10 + * Other names may be trademarks of their respective owners.
1.11 + *
1.12 + * The contents of this file are subject to the terms of either the GNU
1.13 + * General Public License Version 2 only ("GPL") or the Common
1.14 + * Development and Distribution License("CDDL") (collectively, the
1.15 + * "License"). You may not use this file except in compliance with the
1.16 + * License. You can obtain a copy of the License at
1.17 + * http://www.netbeans.org/cddl-gplv2.html
1.18 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
1.19 + * specific language governing permissions and limitations under the
1.20 + * License. When distributing the software, include this License Header
1.21 + * Notice in each file and include the License file at
1.22 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1.23 + * particular file as subject to the "Classpath" exception as provided
1.24 + * by Oracle in the GPL Version 2 section of the License file that
1.25 + * accompanied this code. If applicable, add the following below the
1.26 + * License Header, with the fields enclosed by brackets [] replaced by
1.27 + * your own identifying information:
1.28 + * "Portions Copyrighted [year] [name of copyright owner]"
1.29 + *
1.30 + * If you wish your version of this file to be governed by only the CDDL
1.31 + * or only the GPL Version 2, indicate your decision by adding
1.32 + * "[Contributor] elects to include this software in this distribution
1.33 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
1.34 + * single choice of license, a recipient has the option to distribute
1.35 + * your version of this file under either the CDDL, the GPL Version 2 or
1.36 + * to extend the choice of license to its licensees as provided above.
1.37 + * However, if you add GPL Version 2 code and therefore, elected the GPL
1.38 + * Version 2 license, then the option applies only if the new code is
1.39 + * made subject to such option by the copyright holder.
1.40 + *
1.41 + * Contributor(s):
1.42 + *
1.43 + * Portions Copyrighted 2015 Sun Microsystems, Inc.
1.44 + */
1.45 +package org.netbeans.modules.python.editor.lexer;
1.46 +
1.47 +import java.util.Arrays;
1.48 +import java.util.HashSet;
1.49 +import java.util.Set;
1.50 +
1.51 +/**
1.52 + *
1.53 + * @author jenselme
1.54 + */
1.55 +public class BuiltinException {
1.56 + private final static String[] BUILTIN_EXCEPTIONS_ARRAY = {
1.57 + "ArithmeticError",
1.58 + "AssertionError",
1.59 + "AttributeError",
1.60 + "BaseException",
1.61 + "BlockingIOError",
1.62 + "BrokenPipeError",
1.63 + "BufferError",
1.64 + "BytesWarning",
1.65 + "BytesWarningBaseException",
1.66 + "ChildProcessError",
1.67 + "ConnectionAbortedError",
1.68 + "ConnectionError",
1.69 + "ConnectionRefusedError",
1.70 + "ConnectionResetError",
1.71 + "DeprecationWarning",
1.72 + "EnvironmentError",
1.73 + "EOFError",
1.74 + "Exception",
1.75 + "FileExistsError",
1.76 + "FileNotFoundError",
1.77 + "FloatingPointError",
1.78 + "FutureWarning",
1.79 + "GeneratorExit",
1.80 + "ImportError",
1.81 + "ImportWarning",
1.82 + "IndentationError",
1.83 + "IndexError",
1.84 + "InterruptedError",
1.85 + "IOError",
1.86 + "IsADirectoryError",
1.87 + "KeyboardInterrupt",
1.88 + "KeyError",
1.89 + "LookupError",
1.90 + "MemoryError",
1.91 + "NameError",
1.92 + "NotADirectoryError",
1.93 + "NotImplementedError",
1.94 + "OSError",
1.95 + "OverflowError",
1.96 + "PendingDeprecationWarning",
1.97 + "PermissionError",
1.98 + "ProcessLookupError",
1.99 + "ReferenceError",
1.100 + "ResourceWarning",
1.101 + "RuntimeError",
1.102 + "RuntimeWarning",
1.103 + "StandardError",
1.104 + "StopIteration",
1.105 + "SyntaxError",
1.106 + "SyntaxWarning",
1.107 + "SystemError",
1.108 + "SystemExit",
1.109 + "TabError",
1.110 + "TimeoutError",
1.111 + "TypeError",
1.112 + "UnboundLocalError",
1.113 + "UnicodeDecodeError",
1.114 + "UnicodeEncodeError",
1.115 + "UnicodeError",
1.116 + "UnicodeTranslateError",
1.117 + "UnicodeWarning",
1.118 + "UserWarning",
1.119 + "ValueError",
1.120 + "VMSError",
1.121 + "Warning",
1.122 + "WindowsError",
1.123 + "ZeroDivisionError"
1.124 + };
1.125 + private final static Set<String> BUILTIN_EXCEPTIONS = new HashSet<String>(Arrays.asList(BUILTIN_EXCEPTIONS_ARRAY));
1.126 +
1.127 + public static boolean isBuiltInException(CharSequence name) {
1.128 + return BUILTIN_EXCEPTIONS.contains(name.toString());
1.129 + }
1.130 +}
2.1 --- a/python.editor/src/org/netbeans/modules/python/editor/lexer/PythonLexer.java Fri Sep 11 16:28:37 2015 +0200
2.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/lexer/PythonLexer.java Fri Sep 11 16:53:49 2015 +0200
2.3 @@ -693,7 +693,7 @@
2.4 return null;
2.5 }
2.6
2.7 - if (s.toString().endsWith("Error")) {
2.8 + if (BuiltinException.isBuiltInException(s)) {
2.9 return PythonTokenId.ERROR;
2.10 }
2.11