Minor refactoring, and a fix for #303

CocoaPods · May 1, 2016 · 2f39b49 · 2f39b49
1 parent a067551
commit 2f39b49
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/app/CocoaPods/CPPodfileEditorViewController.swift b/app/CocoaPods/CPPodfileEditorViewController.swift
@@ -342,7 +342,18 @@ extension EditorLineSelection {
 extension CPPodfileEditorViewController: CPUserProjectDelegate {
 
   func contentDidChangeinUserProject(userProject: CPUserProject) {
-    editor.string = userProject.contents
+    let contentChanged = editor.string != userProject.contents
+    let appIsActive = NSApplication.sharedApplication().active
+
+    if contentChanged && !appIsActive {
+      let selection = editor.textView.selectedRange()
+      let scroll = editor.scrollView.visibleRect
+
+      editor.string = userProject.contents
+
+      editor.textView.selectedRange = selection
+      editor.scrollView.scrollPoint(scroll.origin)
+    }
 
     // Passing the message on to the syntax checker
     syntaxChecker.textDidChange(NSNotification(name: "", object: nil))

diff --git a/app/CocoaPods/CPPodfileViewController.swift b/app/CocoaPods/CPPodfileViewController.swift
@@ -90,25 +90,25 @@ class CPPodfileViewController: NSViewController, NSTabViewDelegate {
 
   @IBAction func install(obj: AnyObject) {
     let options = InstallOptions(verbose: false)
-    performInstall(.Install(options: options))
+    performInstallAction(.Install(options: options))
   }
 
   @IBAction func installVerbose(obj: AnyObject) {
     let options = InstallOptions(verbose: true)
-    performInstall(.Install(options: options))
+    performInstallAction(.Install(options: options))
   }
 
   @IBAction func installUpdate(obj: AnyObject) {
     let options = InstallOptions(verbose: false)
-    performInstall(.Update(options: options))
+    performInstallAction(.Update(options: options))
   }
 
   @IBAction func installUpdateVerbose(obj: AnyObject) {
     let options = InstallOptions(verbose: true)
-    performInstall(.Update(options: options))
+    performInstallAction(.Update(options: options))
   }
 
-  func performInstall(action: InstallActionType) {
+  func performInstallAction(action: InstallActionType) {
     userProject.saveDocument(self)
 
     let lastInstalledVersion = userProject.xcodeIntegrationDictionary["cocoapods_build_version"]

diff --git a/app/CocoaPods/CPUserProject.m b/app/CocoaPods/CPUserProject.m
@@ -89,7 +89,6 @@ - (void)presentedItemDidChange
       });
     }
   }
-
 }
 
 @end