Skip to content

Commit

Permalink
Merge pull request #49 from monovertex/master
Browse files Browse the repository at this point in the history
48 - Fix edge case with .sublime-project file not being in the same main folder
  • Loading branch information
pichillilorenzo authored Apr 20, 2018
2 parents cdb130e + a55087f commit 5bffda2
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions src/libs/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -635,17 +635,20 @@ def is_project_open(project):
def is_javascript_project():
project_file_name = sublime.active_window().project_file_name()
project_dir_name = ""
if project_file_name :
if project_file_name:
project_dir_name = os.path.dirname(project_file_name)
settings_dir_name = os.path.join(project_dir_name, PROJECT_SETTINGS_FOLDER_NAME)
return os.path.isdir(settings_dir_name)
else :
# try to look at window.folders()
folders = sublime.active_window().folders()
if len(folders) > 0:
folders = folders[0]
settings_dir_name = os.path.join(folders, PROJECT_SETTINGS_FOLDER_NAME)
return os.path.isdir(settings_dir_name)
if os.path.isdir(settings_dir_name):
return True

# If not found at the location of the .sublime-project file, try to look in the open folders.
folders = sublime.active_window().folders()
if len(folders) > 0:
folders = folders[0]
settings_dir_name = os.path.join(folders, PROJECT_SETTINGS_FOLDER_NAME)
if os.path.isdir(settings_dir_name):
return True

return False

def is_type_javascript_project(type):
Expand Down

0 comments on commit 5bffda2

Please sign in to comment.